git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 27263e2 b367e47)

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	d756bd2d9339447c29bde950910586df8f8941ec
tree	f96aeb682bcc4fdcf75d080f260c809b9fbc4a1a	tree \| snapshot
parent	27263e28321db438bc43dc0c0be432ce91526224	commit \| diff
parent	b367e47fb3a70f5d24ebd6faf7d42436d485fb2d	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

John Crispins staging tree