]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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


Trivial merge