]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ubifs/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Nov 2015 23:30:22 +0000 (10:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Nov 2015 23:30:22 +0000 (10:30 +1100)

Trivial merge