Merge tag 'jfs-3.12' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Oct 2013 08:01:11 +0000 (09:01 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Oct 2013 08:01:11 +0000 (09:01 +0100)
commitd24fec3991076124e069c889c530cdc69cd43fb8
treeaba6da450fd0bf1c903f5bc559506500b15690ef
parentb403b73c21fcab11411a1439867a3ead9117e5e4
parent8660998608cfa1077e560034db81885af8e1e885
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