From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 4 Apr 2012 01:03:49 +0000 (+1000)
Subject: Merge remote-tracking branch 'ecryptfs/next'
X-Git-Tag: next-20120404~54
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5659d88c1c2a5d5fd2421adcf7727c878f4cd16b;p=karo-tx-linux.git

Merge remote-tracking branch 'ecryptfs/next'

Conflicts:
	fs/ecryptfs/ecryptfs_kernel.h
---

5659d88c1c2a5d5fd2421adcf7727c878f4cd16b