]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'parisc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 26 Oct 2012 00:20:03 +0000 (11:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 26 Oct 2012 00:20:03 +0000 (11:20 +1100)

Trivial merge