]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9e5762d f729ffb)
Merge git://git.jan-o-sch.net/btrfs-unstable into integration
authorChris Mason <chris.mason@oracle.com>
Sun, 6 Nov 2011 08:07:10 +0000 (03:07 -0500)
committerChris Mason <chris.mason@oracle.com>
Sun, 6 Nov 2011 08:07:10 +0000 (03:07 -0500)
commit1f98a4c07d906b7845dc55f2553115eecc88322d
tree2de54229a5623756417a9bad7f426a2e8b06cad7tree | snapshot
parent9e5762d5f338a707cf1536cc52163faeb93ed113commit | diff
parentf729ffbe53ee66cb2318bf75b062a3a4ec4cad27commit | diff
Merge git://git.jan-o-sch.net/btrfs-unstable into integration

Conflicts:
fs/btrfs/Makefile
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/scrub.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/Makefile 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.c diff1 | diff2 | blob | history
fs/btrfs/ioctl.c diff1 | diff2 | blob | history
fs/btrfs/reada.c diff1 | | blob | history
fs/btrfs/scrub.c diff1 | diff2 | blob | history
fs/btrfs/volumes.c diff1 | diff2 | blob | history
fs/btrfs/volumes.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.