git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7484b51 1d2c984)

author	Chris Mason <chris.mason@oracle.com>
	Mon, 16 Jan 2012 20:26:17 +0000 (15:26 -0500)
committer	Chris Mason <chris.mason@oracle.com>
	Mon, 16 Jan 2012 20:26:17 +0000 (15:26 -0500)
commit	bc27adcdcfec2056c4b1d93cacb8370c2de1c8e7
tree	f96aeb682bcc4fdcf75d080f260c809b9fbc4a1a	tree \| snapshot
parent	7484b5176885d5609e8dafeaa0638ec55171563f	commit \| diff
parent	1d2c984d76285af32c8bd013322275aff3833996	commit \| diff

Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration

Conflicts:
fs/btrfs/volumes.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>

fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent-tree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/free-space-cache.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.