]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'parisc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 00:07:34 +0000 (10:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 00:07:34 +0000 (10:07 +1000)

Trivial merge