]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b24e2bd e57cf21)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Feb 2015 18:34:24 +0000 (10:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Feb 2015 18:34:24 +0000 (10:34 -0800)
commit7dac5cb1bc8c4bc420f0cafd9c42d693eadfdd7e
treed9577362d46069bf69c956577c0cd2444d0b22b2tree | snapshot
parentb24e2bdde4af656bb0679a101265ebb8f8735d3ccommit | diff
parente57cf21e9787c081db4db6afa02e6e70112ee410commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs fix from Chris Mason:
 "I'm still testing more fixes, but I wanted to get out the fix for the
  btrfs raid5/6 memory corruption I mentioned in my merge window pull"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix allocation size calculations in alloc_btrfs_bio
Linux kernel for KaRo TX COM modules