om> 1253068667 -0500
committer Alex Elder <aelder@sgi.com> 1253068667 -0500

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

Conflicts:
	fs/xfs/linux-2.6/xfs_lrw.c
n[nؕ!x