]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ecryptfs/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 01:13:08 +0000 (11:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 01:13:08 +0000 (11:13 +1000)
commit0adfab6a4f2ad0b0282b8c1227738ec83a5c023d
treebdb4515e456fa91f639ae7ad7214cdcba2fabf56
parent5c6a66a48541eb99977199b0a7e10ca0fce5e478
parent6cfd4b42f29db32426499c9dca8885ea04b04839
Merge remote-tracking branch 'ecryptfs/next'

Conflicts:
fs/ecryptfs/ecryptfs_kernel.h