]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs...
authorChris Mason <chris.mason@oracle.com>
Fri, 17 Jun 2011 18:16:13 +0000 (14:16 -0400)
committerChris Mason <chris.mason@oracle.com>
Fri, 17 Jun 2011 18:16:13 +0000 (14:16 -0400)
commitfb02ddd794b011acdbdf156ec1750b1cdcc74acd
treeefd5d76b77f21b4a9e570f2cb5bed9f95970f7a0
parenta8d11ce8601c7b14a5bee83f538e0e5bc09d9944
parent526b0878c073c8284ce9bce65873d81191916756
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work into for-linus

Conflicts:
fs/btrfs/transaction.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/transaction.c