From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 20 Dec 2011 23:58:50 +0000 (+1100)
Subject: Merge remote-tracking branch 'ecryptfs/next'
X-Git-Tag: next-20111221~82
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e876cd2935e7fefa079d9d0540bef1a472942333;p=karo-tx-linux.git

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

e876cd2935e7fefa079d9d0540bef1a472942333