Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 24 May 2007 16:17:12 +0000 (09:17 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 24 May 2007 16:17:12 +0000 (09:17 -0700)
commitd333fc8d3006296f2893d17817bc0f67cf87f353
treef759092ae962b0071e805e4526ffff57995d487b
parent1a93fa86bf6eb0d8bed84ef18c8b35be389edee5
parentd4a8f3677fe2c2fc86443254fe42825e244c194d
Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6

* 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6:
  NFS: Fix nfs_direct_dirty_pages()
  NFS: Fix handful of compiler warnings in direct.c
  NFS: Avoid a deadlock situation on write