Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Nov 2014 22:30:24 +0000 (14:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Nov 2014 22:30:24 +0000 (14:30 -0800)
commitc4c23fb6f2b17c922b493f79cf27a0d32397f461
tree64b651ddc98fde641da2e1dd93d1bdca619565a4
parent0b0c7dbd986440474b4d6771611da59c22b63078
parent6e5aafb27419f32575b27ef9d6a31e5d54661aca
Merge branch 'for-linus' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fix from Chris Mason:
 "It's a one liner for an error cleanup path that leads to crashes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix kfree on list_head in btrfs_lookup_csums_range error cleanup