projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b0c7db 6e5aafb)
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)
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


Trivial merge
John Crispins staging tree