Merge tag 'jfs-3.11' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Jul 2013 17:19:34 +0000 (10:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Jul 2013 17:19:34 +0000 (10:19 -0700)
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

1  2 
fs/jfs/jfs_dtree.c
fs/jfs/jfs_metapage.c
fs/jfs/namei.c

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