]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ecryptfs/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 01:42:06 +0000 (11:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 01:42:06 +0000 (11:42 +1000)
commitcb09e98a39347f0501e092dc2c9a37b8288040a3
treea08298e3ba5d9a02f108aa814af46d726d9438ed
parent162e6b8a2f4a0c9edbf7bc5f6928970b51093614
parent6cfd4b42f29db32426499c9dca8885ea04b04839
Merge remote-tracking branch 'ecryptfs/next'

Conflicts:
fs/ecryptfs/ecryptfs_kernel.h