From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 May 2010 17:18:44 +0000 (-0700)
Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ade61088bc77dd209f8edadbe544f1e5dad6c287;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFS: Fix another nfs_wb_page() deadlock
  NFS: Ensure that we mark the inode as dirty if we exit early from commit
  NFS: Fix a lock imbalance typo in nfs_access_cache_shrinker
  sunrpc: fix leak on error on socket xprt setup
---

ade61088bc77dd209f8edadbe544f1e5dad6c287