]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hch/xfs-icache-races
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Aug 2009 01:53:44 +0000 (18:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Aug 2009 01:53:44 +0000 (18:53 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/hch/xfs-icache-races:
  xfs: fix freeing of inodes not yet added to the inode cache
  vfs: add __destroy_inode
  vfs: fix inode_init_always calling convention


Trivial merge