]> 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, 20 Dec 2013 03:22:55 +0000 (14:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 03:22:55 +0000 (14:22 +1100)

Trivial merge