From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jul 2013 17:19:34 +0000 (-0700)
Subject: Merge tag 'jfs-3.11' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: firefly_0821_release~176^2~5718
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9db019278cad416681e27b15203d4c5e939c315b;p=firefly-linux-kernel-4.4.55.git

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
---

9db019278cad416681e27b15203d4c5e939c315b