git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git/commit

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9785dbd 21adbd5)

author	Chris Mason <chris.mason@oracle.com>
	Mon, 16 Jan 2012 20:27:58 +0000 (15:27 -0500)
committer	Chris Mason <chris.mason@oracle.com>
	Mon, 16 Jan 2012 20:27:58 +0000 (15:27 -0500)
commit	c126dea771be1b3c370c0ffc4a09e6a82d492a49
tree	99fc723ba2e89d767e260244cf8d19467bc68c8b	tree \| snapshot (tar.gz zip)
parent	9785dbdf265ddc47d5c88267d89a97648c0dc14b	commit \| diff
parent	21adbd5cbb5344a3fca6bb7ddb2ab6cb03c44546	commit \| diff

Merge branch 'integrity-check-patch-v2' of git://btrfs.giantdisaster.de/git/btrfs into integration

Conflicts:
fs/btrfs/ctree.h
fs/btrfs/super.c

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

fs/btrfs/Makefile	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ctree.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/scrub.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/super.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.c	diff1 \|	diff2 \|	blob \| history