]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ecryptfs/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 01:03:49 +0000 (11:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 01:03:49 +0000 (11:03 +1000)
commit5659d88c1c2a5d5fd2421adcf7727c878f4cd16b
tree06761c30042a2b707d07727f3e39c733c2fa0720
parent34d90c0a0e00dd989f6c1dddcb420ef4c5fc000e
parent6cfd4b42f29db32426499c9dca8885ea04b04839
Merge remote-tracking branch 'ecryptfs/next'

Conflicts:
fs/ecryptfs/ecryptfs_kernel.h