]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ecryptfs/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 00:56:40 +0000 (10:56 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 00:56:40 +0000 (10:56 +1000)
commita55970a7989f6507aa48cae1485b68898f76e393
tree6464d4dd9d3d299dda6cca2d5ed13a170369a437
parent4d0cd5b910ff10f7f3b2ace2054635e9ec6c04e4
parent6cfd4b42f29db32426499c9dca8885ea04b04839
Merge remote-tracking branch 'ecryptfs/next'

Conflicts:
fs/ecryptfs/ecryptfs_kernel.h