Merge branch 'xfs-for-linus-v3.13-rc5' into for-next

author Ben Myers <bpm@sgi.com>

Wed, 18 Dec 2013 16:36:58 +0000 (10:36 -0600)

committer Ben Myers <bpm@sgi.com>

Wed, 18 Dec 2013 16:36:58 +0000 (10:36 -0600)
author Ben Myers <bpm@sgi.com>
Wed, 18 Dec 2013 16:36:58 +0000 (10:36 -0600)
committer Ben Myers <bpm@sgi.com>
Wed, 18 Dec 2013 16:36:58 +0000 (10:36 -0600)
diff --cc fs/xfs/xfs_buf.c
Simple merge
diff --cc fs/xfs/xfs_buf_item.c
Simple merge
diff --cc fs/xfs/xfs_log_recover.c
Simple merge
author	Ben Myers <bpm@sgi.com>
	Wed, 18 Dec 2013 16:36:58 +0000 (10:36 -0600)
committer	Ben Myers <bpm@sgi.com>
	Wed, 18 Dec 2013 16:36:58 +0000 (10:36 -0600)
		1	2
fs/xfs/xfs_buf.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_buf_item.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_log_recover.c	patch \|	diff1 \|	diff2 \|	blob \| history