]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ixp4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Dec 2012 04:21:33 +0000 (15:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Dec 2012 04:21:33 +0000 (15:21 +1100)

Trivial merge