From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Oct 2013 08:01:11 +0000 (+0100)
Subject: Merge tag 'jfs-3.12' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: firefly_0821_release~176^2~5122
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d24fec3991076124e069c889c530cdc69cd43fb8;p=firefly-linux-kernel-4.4.55.git

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

Pull jfs bugfix from David Kleikamp:
 "Just a patch to fix an oops in an error path"

* tag 'jfs-3.12' of git://github.com/kleikamp/linux-shaggy:
  jfs: fix error path in ialloc
---

d24fec3991076124e069c889c530cdc69cd43fb8