From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 24 May 2007 16:17:12 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
X-Git-Tag: v2.6.22-rc3~15
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=d333fc8d3006296f2893d17817bc0f67cf87f353

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
---

d333fc8d3006296f2893d17817bc0f67cf87f353