tree 0b5acc01e1d464f4bd9c133f7cee0de3df7cbc61
parent 9035a6450d124a7787e5e3272b630a79d201555f
parent 56335936de1a41c8978fde62b2158af77ddc7258
author Linus Torvalds <torvalds@linux-foundation.org> 1262987714 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1262987714 -0800

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