git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 174ba50 d90c732)
Merge branch 'for-chris' of
authorChris Mason <chris.mason@oracle.com>
Sat, 28 May 2011 11:00:39 +0000 (07:00 -0400)
committerChris Mason <chris.mason@oracle.com>
Sat, 28 May 2011 11:00:39 +0000 (07:00 -0400)
git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work into for-linus

Conflicts:
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/transaction.c

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

Trivial merge
Pandora Kernel Repository