Merge remote-tracking branch 'ecryptfs/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:52:50 +0000 (10:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:52:50 +0000 (10:52 +1100)
commit321514a081f15ea3c326f9bd2d5b29c3232e2226
tree6aa59b7b55d599cf37e3d6f348fa01d692164654
parent5779271a152fea23f2dac2b1478ebe3c1fe3aec3
parent933c32fe0e42b86d9bc5779401c3ce93d56bd231
Merge remote-tracking branch 'ecryptfs/next'