From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Oct 2010 00:24:28 +0000 (-0700)
Subject: Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=18a043f9413277523cf5011e594caa1747db4948;p=mv-sheeva.git

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

* 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFS: rename nfs.upcall -> nfs.idmap
  NFS: Fix a compile issue in nfs_root
---

18a043f9413277523cf5011e594caa1747db4948