Merge remote-tracking branch 'ecryptfs/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 24 Jul 2012 23:50:14 +0000 (09:50 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 24 Jul 2012 23:50:14 +0000 (09:50 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 24 Jul 2012 23:50:14 +0000 (09:50 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 24 Jul 2012 23:50:14 +0000 (09:50 +1000)
diff --cc fs/ecryptfs/ecryptfs_kernel.h
Simple merge
diff --cc fs/ecryptfs/inode.c
Simple merge
diff --cc fs/ecryptfs/main.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 24 Jul 2012 23:50:14 +0000 (09:50 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 24 Jul 2012 23:50:14 +0000 (09:50 +1000)
		1	2
fs/ecryptfs/ecryptfs_kernel.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ecryptfs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ecryptfs/main.c	patch \|	diff1 \|	diff2 \|	blob \| history