From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 30 Nov 2011 01:16:58 +0000 (+1100)
Subject: Merge remote-tracking branch 'ecryptfs/next'
X-Git-Tag: next-20111130~70
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9a85320f17a0d968592adaf1d463e31eac94768f;p=karo-tx-linux.git

Merge remote-tracking branch 'ecryptfs/next'
---

9a85320f17a0d968592adaf1d463e31eac94768f