]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ixp4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Oct 2012 01:41:57 +0000 (12:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Oct 2012 01:41:57 +0000 (12:41 +1100)

Trivial merge