diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-20 16:57:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-20 16:57:09 -0500 |
| commit | 1ca22254b32657d65315af261ae0e699b8427fb7 (patch) | |
| tree | 0cd199bd477b173e3697b17a185c1e93400858d4 /include/asm-generic/iomap.h | |
| parent | a13eea6bd9ee62ceacfc5243d54c84396bc86cb4 (diff) | |
| parent | 57ba86c00f9573b63b8c06810d4f6915efed2442 (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"
Diffstat (limited to 'include/asm-generic/iomap.h')
0 files changed, 0 insertions, 0 deletions