]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'file-private-locks/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 00:43:38 +0000 (10:43 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 00:43:38 +0000 (10:43 +1000)

Trivial merge