tree f759092ae962b0071e805e4526ffff57995d487b
parent 1a93fa86bf6eb0d8bed84ef18c8b35be389edee5
parent d4a8f3677fe2c2fc86443254fe42825e244c194d
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1180023432 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1180023432 -0700

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