]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit581180e0a86912ef1522a51351d877159f71929c
treebcf5d4dd46b4945f3b4bec6b763ff9a9484e4e59
parent057faa1e88427d4f7c4bbebe5a712c0c4ac3d8bf
parent5fe373816924a50e3b08f581728bf7fa527544c3
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