]> bbs.cooldavid.org Git - net-next-2.6.git/commit
git://bbs.cooldavid.org / net-next-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8216ef8 e9bb7f1)
Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs...
authorChris Mason <chris.mason@oracle.com>
Fri, 29 Oct 2010 13:27:49 +0000 (09:27 -0400)
committerChris Mason <chris.mason@oracle.com>
Fri, 29 Oct 2010 13:27:49 +0000 (09:27 -0400)
commit6b5b817f103450444f3f658a498f435d92a197e5
tree2896588127c4dd6c2867ef09e7e3cdd83391f8aetree | snapshot (tar.bz2 tar.gz zip)
parent8216ef866df1119fd5a72372b8b29bce49c18590commit | diff
parente9bb7f10d3617304ef94ff7aa8fefbce3078f08bcommit | diff
Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work

Conflicts:
fs/btrfs/extent-tree.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/ctree.h diff1 | diff2 | blob | history
fs/btrfs/extent-tree.c diff1 | diff2 | blob | history
fs/btrfs/inode.c diff1 | diff2 | blob | history
fs/btrfs/relocation.c diff1 | diff2 | blob | history
fs/btrfs/super.c diff1 | diff2 | blob | history
fs/btrfs/transaction.c diff1 | diff2 | blob | history
Clone of davem's net-next-2.6 tree