From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jan 2010 21:55:14 +0000 (-0800)
Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e2b6d02cca533715d6be40fdfc32d3cc47333358;p=openwrt%2Fstaging%2Fblogic.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 oops in nfs_rename()
  sunrpc: fix build-time warning
  sunrpc: on successful gss error pipe write, don't return error
  SUNRPC: Fix the return value in gss_import_sec_context()
  SUNRPC: Fix up an error return value in gss_import_sec_context_kerberos()
---

e2b6d02cca533715d6be40fdfc32d3cc47333358