projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b5d67f6 65139ed)
Merge branch 'error-handling' into for-linus
authorChris Mason <chris.mason@oracle.com>
Thu, 29 Mar 2012 00:31:37 +0000 (20:31 -0400)
committerChris Mason <chris.mason@oracle.com>
Thu, 29 Mar 2012 00:31:37 +0000 (20:31 -0400)
commit1d4284bd6e8d7dd1d5521a6747bdb6dc1caf0225
treea7dde6312ec24eb6368cad7a3efedbf368a5a70ctree | snapshot
parentb5d67f64f9bc656970dacba245410f0faedad18ecommit | diff
parent65139ed99234d8505948cdb7a835452eb5c191f9commit | diff
Merge branch 'error-handling' into for-linus

Conflicts:
fs/btrfs/ctree.c
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/inode.c
fs/btrfs/scrub.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/ctree.c 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/extent_io.c diff1 | diff2 | blob | history
fs/btrfs/extent_io.h diff1 | diff2 | blob | history
fs/btrfs/inode-item.c diff1 | diff2 | blob | history
fs/btrfs/inode.c diff1 | diff2 | blob | history
fs/btrfs/scrub.c diff1 | diff2 | blob | history
fs/btrfs/volumes.c diff1 | diff2 | blob | history
John Crispins staging tree