]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ecryptfs/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 11 Nov 2012 23:29:43 +0000 (10:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 11 Nov 2012 23:29:43 +0000 (10:29 +1100)

Trivial merge