]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit23c903a497c5f3996f003996c2757c8b8d921579
tree53a936ecdf8e9c59735fa4e7794ccb503b06d5d5
parent998b0154dfa501dd392aea241326fd0974f3255b
parentbfcb09af25786381f9423fba61b1b16592009a80
Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/linux-2.6/xfs_iops.c