| commit | 18a043f9413277523cf5011e594caa1747db4948 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 26 17:24:28 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 26 17:24:28 2010 -0700 |
| tree | f5d7e908bf62e67184f91ce83b6b7624755826ac | |
| parent | 31453a9764f7e2a72a6e2c502ace586e2663a68c [diff] | |
| parent | eb1c86b8b501ad9a073d9d519105979d31fa0ef2 [diff] |
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