Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus
authorAlex Elder <aelder@sgi.com>
Wed, 16 Sep 2009 02:37:47 +0000 (21:37 -0500)
committerAlex Elder <aelder@sgi.com>
Wed, 16 Sep 2009 02:37:47 +0000 (21:37 -0500)
commitfdec29c5fcd2705d61c1d14a1d4c74be03e9627c
treebcf5d4dd46b4945f3b4bec6b763ff9a9484e4e59
parent0cb583fd2862f19ea88b02eb307d11c09e51e2f8
parent9ef96da6ec5e1b4cf7eb8e30852cd88ec7d5fdc0
Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus

Conflicts:
fs/xfs/linux-2.6/xfs_lrw.c
MAINTAINERS
fs/xfs/linux-2.6/xfs_iops.c