]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Jul 2011 06:45:06 +0000 (23:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Jul 2011 06:45:06 +0000 (23:45 -0700)
commitea14c566810d8e98081637cc6070d110ee86466d
tree2b9872f659ac73df93fdaeca4d37654a5a84d4fc
parent8125b50cea842888549ea170b464ef4917cfb8b7
parent9753f7a48a1f889bc2abf9ac904b1cd5db8695e1
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not set