From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Apr 2012 01:13:08 +0000 (+1000)
Subject: Merge remote-tracking branch 'ecryptfs/next'
X-Git-Tag: next-20120430~82
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0adfab6a4f2ad0b0282b8c1227738ec83a5c023d;p=karo-tx-linux.git

Merge remote-tracking branch 'ecryptfs/next'

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

0adfab6a4f2ad0b0282b8c1227738ec83a5c023d