summaryrefslogtreecommitdiff
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-11 21:19:34 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-11 21:19:34 +0400
commit9db019278cad416681e27b15203d4c5e939c315b (patch)
treee0c7e440af4444176a34320e18df8d623201dad5 /fs/ecryptfs
parent0ff08ba5d066619f9973bfcdb5a21320d54219d0 (diff)
parenteb8630d7d2fd13589e6a7a3ae2fe1f75f867fbed (diff)
downloadlinux-9db019278cad416681e27b15203d4c5e939c315b.tar.xz
Merge tag 'jfs-3.11' of git://github.com/kleikamp/linux-shaggy
Pull jfs update from Dave Kleikamp: "A couple cleanups to JFS for 3.11" * tag 'jfs-3.11' of git://github.com/kleikamp/linux-shaggy: jfs: Update jfs_error jfs: fix sparse warning in fs/jfs/xattr.c
Diffstat (limited to 'fs/ecryptfs')
0 files changed, 0 insertions, 0 deletions