]> Git Repo - linux.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <[email protected]>
Thu, 20 Dec 2012 21:57:09 +0000 (13:57 -0800)
committerLinus Torvalds <[email protected]>
Thu, 20 Dec 2012 21:57:09 +0000 (13:57 -0800)
Pull two btrfs reverts from Chris Mason:
 "I had missed that for two of the patches in my last pull, we had
  included different fixes during 3.7."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Revert "Btrfs: reorder tree mod log operations in deleting a pointer"
  Revert "Btrfs: MOD_LOG_KEY_REMOVE_WHILE_MOVING never change node's nritems"


Trivial merge
This page took 0.052291 seconds and 4 git commands to generate.