Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

diff --cc fs/xfs/linux-2.6/xfs_buf.c
Simple merge

diff --cc fs/xfs/linux-2.6/xfs_sync.c
Simple merge

diff --cc fs/xfs/xfs_bmap.c
Simple merge

diff --cc fs/xfs/xfs_da_btree.c
Simple merge

diff --cc fs/xfs/xfs_inode.c
Simple merge

diff --cc fs/xfs/xfs_log_recover.c
Simple merge

diff --cc fs/xfs/xfs_mount.c
Simple merge

diff --cc fs/xfs/xfs_vnodeops.c
Simple merge