From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 4 Nov 2015 23:52:50 +0000 (+1100)
Subject: Merge remote-tracking branch 'ecryptfs/next'
X-Git-Tag: KARO-TXUL-2015-12-04~124
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=321514a081f15ea3c326f9bd2d5b29c3232e2226

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

321514a081f15ea3c326f9bd2d5b29c3232e2226