Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 May 2008 18:39:57 +0000 (11:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 May 2008 18:39:57 +0000 (11:39 -0700)
commitbb78be8397d3b0900af3d717672218ee3ea07985
tree8d16cb48aa31d29a0e3f5aa94d4b5ea965b553ba
parent31d9168d27fac127d449cb9fa252d880de872c7f
parent0b2bac2f1ea0d33a3621b27ca68b9ae760fca2e9
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  [PATCH] fix SMP ordering hole in fcntl_setlk()
  [PATCH] kill ->put_inode
  [PATCH] fix reservation discarding in affs