]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a1294b 29aa667)
Merge branch 'integrity-check-patch-v2' of git://btrfs.giantdisaster.de/git/btrfs...
authorChris Mason <chris.mason@oracle.com>
Mon, 16 Jan 2012 20:27:58 +0000 (15:27 -0500)
committerChris Mason <chris.mason@oracle.com>
Mon, 16 Jan 2012 20:27:58 +0000 (15:27 -0500)
commit73d3de01792d1613e921824be04ef2c7c265ce49
tree99fc723ba2e89d767e260244cf8d19467bc68c8btree | snapshot
parent5a1294beda4c40b8e608e3296e5f3a46f572a90acommit | diff
parent29aa66793d461d9e494f438b64f8f531a7464f43commit | 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
Linux Kernel Source Tree.