]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'slab/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Dec 2011 01:08:47 +0000 (12:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Dec 2011 01:08:47 +0000 (12:08 +1100)

Trivial merge