]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ia64/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 7 Jan 2014 00:15:08 +0000 (11:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 7 Jan 2014 00:15:08 +0000 (11:15 +1100)

Trivial merge