]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Oct 2010 00:24:28 +0000 (17:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Oct 2010 00:24:28 +0000 (17:24 -0700)
commit18a043f9413277523cf5011e594caa1747db4948
treef5d7e908bf62e67184f91ce83b6b7624755826ac
parent31453a9764f7e2a72a6e2c502ace586e2663a68c
parenteb1c86b8b501ad9a073d9d519105979d31fa0ef2
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