git.stricted.de - GitHub/LineageOS/android_kernel_samsung_universal7580.git/commit

projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b5d67f6 65139ed)

author	Chris Mason <chris.mason@oracle.com>
	Thu, 29 Mar 2012 00:31:37 +0000 (20:31 -0400)
committer	Chris Mason <chris.mason@oracle.com>
	Thu, 29 Mar 2012 00:31:37 +0000 (20:31 -0400)
commit	1d4284bd6e8d7dd1d5521a6747bdb6dc1caf0225
tree	a7dde6312ec24eb6368cad7a3efedbf368a5a70c	tree \| snapshot (tar.gz zip)
parent	b5d67f64f9bc656970dacba245410f0faedad18e	commit \| diff
parent	65139ed99234d8505948cdb7a835452eb5c191f9	commit \| diff

Merge branch 'error-handling' into for-linus

Conflicts:
fs/btrfs/ctree.c
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/inode.c
fs/btrfs/scrub.c

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

fs/btrfs/ctree.c	diff1 \|	diff2 \|	blob \| history
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/extent_io.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode-item.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/scrub.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.c	diff1 \|	diff2 \|	blob \| history