]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'cris/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 24 Jul 2012 23:38:26 +0000 (09:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 24 Jul 2012 23:38:26 +0000 (09:38 +1000)

Trivial merge