]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ecryptfs/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:10:36 +0000 (11:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:10:36 +0000 (11:10 +1000)
commit79992a634f576db17cc9d43165f83203e0715964
tree803ab39470f43eaaa3e5d1f720efd249f1e05be0
parente96e8c8d57d1597a17e94cd68010e46d9426c5e0
parent6cfd4b42f29db32426499c9dca8885ea04b04839
Merge remote-tracking branch 'ecryptfs/next'

Conflicts:
fs/ecryptfs/ecryptfs_kernel.h