projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aa2dfb3 8628764)
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs...
authorChris Mason <chris.mason@oracle.com>
Mon, 23 May 2011 10:30:52 +0000 (06:30 -0400)
committerChris Mason <chris.mason@oracle.com>
Mon, 23 May 2011 10:30:52 +0000 (06:30 -0400)
commit712673339a0d085358fd1cd3a6477cc7979bb69f
treeb2e268685e3cbba19a4adb2a47d853e4e461fcfctree | snapshot
parentaa2dfb372a2a647beedac163ce6f8b0fcbefac29commit | diff
parent8628764e1a5e1998a42b9713e9edea7753653d01commit | diff
Merge branch 'for-chris' of git://git./linux/kernel/git/arne/btrfs-unstable-arne into inode_numbers

Conflicts:
fs/btrfs/Makefile
fs/btrfs/ctree.h
fs/btrfs/volumes.h

Signed-off-by: Chris Mason <chris.mason@oracle.com>
12 files changed:
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/file-item.c diff1 | diff2 | blob | history
fs/btrfs/inode.c diff1 | diff2 | blob | history
fs/btrfs/ioctl.c diff1 | diff2 | blob | history
fs/btrfs/relocation.c diff1 | diff2 | blob | history
fs/btrfs/scrub.c | diff2 | blob | history
fs/btrfs/transaction.c diff1 | diff2 | blob | history
fs/btrfs/tree-log.c diff1 | diff2 | blob | history
fs/btrfs/volumes.c diff1 | diff2 | blob | history
fs/btrfs/volumes.h diff1 | diff2 | blob | history
John Crispins staging tree