Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
authorFelix Blyakher <felixb@sgi.com>
Thu, 11 Jun 2009 21:56:49 +0000 (16:56 -0500)
committerFelix Blyakher <felixb@sgi.com>
Thu, 11 Jun 2009 21:56:49 +0000 (16:56 -0500)
commit35fd035968de4f674b9d62ee7b1d80ab7a50c384
tree53a936ecdf8e9c59735fa4e7794ccb503b06d5d5
parent4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7
parentef14f0c1578dce4b688726eb2603e50b62d6665a
Merge branch 'master' of git://git./fs/xfs/xfs
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/linux-2.6/xfs_iops.c