Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Nov 2011 01:37:17 +0000 (23:37 -0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Nov 2011 01:37:17 +0000 (23:37 -0200)
commit53e3ccfd153f0e71352b34a930e231ac1ae07d5e
treeb369d99756a8ddf7ebd9b13cc9c011bf9bd32ba4
parent5e442a493fc59fa536c76db1fff5b49ca36a88c5
parent810627d9a6d0e8820c798001875bc4e1b7754ebf
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix force shutdown handling in xfs_end_io
  xfs: constify xfs_item_ops
  xfs: Fix possible memory corruption in xfs_readlink