git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0965537 16cdcec)

author	Chris Mason <chris.mason@oracle.com>
	Sun, 22 May 2011 11:07:01 +0000 (07:07 -0400)
committer	Chris Mason <chris.mason@oracle.com>
	Sun, 22 May 2011 11:07:01 +0000 (07:07 -0400)
commit	dcc6d073225b6b732a52477c91bd4edc9b4d5502
tree	71da6844bb03c940c87c01a2a1f8c2e11cf85238	tree \| snapshot
parent	0965537308ac3b267ea16e731bd73870a51c53b8	commit \| diff
parent	16cdcec736cd214350cdb591bf1091f8beedefa0	commit \| diff

Merge branch 'delayed_inode' into inode_numbers

Conflicts:
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/transaction.c

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

fs/btrfs/btrfs_inode.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ctree.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent-tree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/transaction.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/tree-log.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree