Merge tag 'jfs-3.14' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Jan 2014 16:14:35 +0000 (08:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Jan 2014 16:14:35 +0000 (08:14 -0800)
Pull jfs fix from David Kleikamp:
 "Minor bug fix for linux-3.14"

* tag 'jfs-3.14' of git://github.com/kleikamp/linux-shaggy:
  jfs: fix xattr value size overflow in __jfs_setxattr

1  2 
fs/jfs/xattr.c

diff --cc fs/jfs/xattr.c
Simple merge