]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ecryptfs/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 24 Jul 2012 23:50:14 +0000 (09:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 24 Jul 2012 23:50:14 +0000 (09:50 +1000)
commit498e9d3af18fa85fc6d93974996b647929711845
tree8443e78efbc115eb760349245510be44d5691e4e
parenta45b76b7f4bd58ae7b655bea2622a50aa5efab23
parent5f5b331d5c21228a6519dcb793fc1629646c51a6
Merge remote-tracking branch 'ecryptfs/next'
fs/ecryptfs/ecryptfs_kernel.h
fs/ecryptfs/inode.c
fs/ecryptfs/main.c