git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 531f4b1 5da6fcb)
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)
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>

Trivial merge
Pandora Kernel Repository