]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 59953fb a3bdccc)
Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Apr 2015 00:40:30 +0000 (17:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Apr 2015 00:40:30 +0000 (17:40 -0700)
commitf583381f506dc53b9d3e98cf9d6577323eb3fcd2
tree5a53895acd1d3c6adab886910399780dd95d65e3tree
parent59953fba87e5e535657403cc6439d24187929559commit | diff
parenta3bdccc4e683f0ac69230707ed3fa20e7cf73a79commit | diff
Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes from Chris Mason:
 "Filipe hit two problems in my block group cache patches.  We finalized
  the fixes last week and ran through more tests"

* 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: prevent list corruption during free space cache processing
  Btrfs: fix inode cache writeout
Ubuntu combined Linux kernel mirror