Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus

author Alex Elder <[email protected]>

Wed, 16 Sep 2009 02:37:47 +0000 (21:37 -0500)

committer Alex Elder <[email protected]>

Wed, 16 Sep 2009 02:37:47 +0000 (21:37 -0500)
author Alex Elder <[email protected]>
Wed, 16 Sep 2009 02:37:47 +0000 (21:37 -0500)
committer Alex Elder <[email protected]>
Wed, 16 Sep 2009 02:37:47 +0000 (21:37 -0500)
diff --cc MAINTAINERS
Simple merge
diff --cc fs/xfs/linux-2.6/xfs_iops.c
Simple merge
author	Alex Elder <[email protected]>
	Wed, 16 Sep 2009 02:37:47 +0000 (21:37 -0500)
committer	Alex Elder <[email protected]>
	Wed, 16 Sep 2009 02:37:47 +0000 (21:37 -0500)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/linux-2.6/xfs_iops.c	patch \|	diff1 \|	diff2 \|	blob \| history