| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 20 Dec 2012 21:57:09 +0000 (13:57 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 20 Dec 2012 21:57:09 +0000 (13:57 -0800) | ||
| commit | 1ca22254b32657d65315af261ae0e699b8427fb7 | |
| tree | 0cd199bd477b173e3697b17a185c1e93400858d4 | tree | snapshot (tar.xz tar.gz zip) |
| parent | a13eea6bd9ee62ceacfc5243d54c84396bc86cb4 | commit | diff |
| parent | 57ba86c00f9573b63b8c06810d4f6915efed2442 | commit | diff |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
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"
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"