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)
commit9db019278cad416681e27b15203d4c5e939c315b
treee0c7e440af4444176a34320e18df8d623201dad5
parent0ff08ba5d066619f9973bfcdb5a21320d54219d0
parenteb8630d7d2fd13589e6a7a3ae2fe1f75f867fbed
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
fs/jfs/jfs_dtree.c
fs/jfs/jfs_metapage.c
fs/jfs/namei.c