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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 19f949f 272d26d)

author	Chris Mason <chris.mason@fusionio.com>
	Wed, 20 Feb 2013 19:05:45 +0000 (14:05 -0500)
committer	Chris Mason <chris.mason@fusionio.com>
	Wed, 20 Feb 2013 19:05:45 +0000 (14:05 -0500)
commit	b2c6b3e0611c58fbeb6b9c0892b6249f7bdfaf6b
tree	de7cf0825605aa6acf33a8d107003efd7aedbe72	tree \| snapshot
parent	19f949f52599ba7c3f67a5897ac6be14bfcb1200	commit \| diff
parent	272d26d0ad8c0e326689f2fa3cdc6a5fcc8e74e0	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/josef/btrfs-next into for-linus-3.9

Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Conflicts:
fs/btrfs/disk-io.c

fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent-tree.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/ordered-data.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/Kbuild	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree