From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 Jun 2013 21:33:44 +0000 (+0900)
Subject: Merge tag 'jfs-3.10-rc5' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: firefly_0821_release~3680^2~371
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0ab60871b451b857206d7afc0d3033be866f76b4;p=firefly-linux-kernel-4.4.55.git

Merge tag 'jfs-3.10-rc5' of git://github.com/kleikamp/linux-shaggy

Pull jfs bugfixes from David Kleikamp:
 "A couple jfs bug fixes for 3.10-rc5"

* tag 'jfs-3.10-rc5' of git://github.com/kleikamp/linux-shaggy:
  fs/jfs: Add check if journaling to disk has been disabled in lbmRead()
  jfs: Several bugs in jfs_freeze() and jfs_unfreeze()
---

0ab60871b451b857206d7afc0d3033be866f76b4