From: Linus Torvalds 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: v3.12-rc7~25 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/d24fec3991076124e069c889c530cdc69cd43fb8 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