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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d756bd2 6bf7e08)

author	Chris Mason <chris.mason@oracle.com>
	Mon, 16 Jan 2012 20:26:31 +0000 (15:26 -0500)
committer	Chris Mason <chris.mason@oracle.com>
	Mon, 16 Jan 2012 20:26:31 +0000 (15:26 -0500)
commit	9785dbdf265ddc47d5c88267d89a97648c0dc14b
tree	3a97a48d6f282f9e06c5446beeb886fcd86c4798	tree \| snapshot
parent	d756bd2d9339447c29bde950910586df8f8941ec	commit \| diff
parent	6bf7e080d5bcb0d399ee38ce3dabbfad64448192	commit \| diff

Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into integration

fs/btrfs/ctree.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent-tree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/relocation.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/scrub.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/transaction.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/tree-log.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree