git.agner.ch Git - linux-drm-fsl-dcu.git/commit

projects / linux-drm-fsl-dcu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 67c9684 6f72c7e)

author	Chris Mason <chris.mason@fusionio.com>
	Wed, 25 Jul 2012 20:11:38 +0000 (16:11 -0400)
committer	Chris Mason <chris.mason@fusionio.com>
	Wed, 25 Jul 2012 20:11:38 +0000 (16:11 -0400)
commit	b478b2baa37ac99fc04a30809c780dd5dfd43595
tree	bed7af1466e5b1e0b0501eba18f77c804a864d7d	tree \| snapshot
parent	67c9684f48ea9cbc5e9b8a1feb3151800e9dcc22	commit \| diff
parent	6f72c7e20dbaea55f04546de69586c84a3654503	commit \| diff

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

Conflicts:
fs/btrfs/ioctl.c
fs/btrfs/ioctl.h
fs/btrfs/transaction.c
fs/btrfs/transaction.h

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

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/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/transaction.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/transaction.h	diff1 \|	diff2 \|	blob \| history

Freescale DCU DRM driver