]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ixp4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 05:24:13 +0000 (16:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 05:24:13 +0000 (16:24 +1100)

Trivial merge