]> git.baikalelectronics.ru Git - 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)
commit2f381e7d5b54d63b12a291429934491feb29485e
treef5d7e908bf62e67184f91ce83b6b7624755826ac
parent1701ba9aeb0701534618eb3b80ec3a54f947cde3
parent7d19c16dcf6316857637e41bc2c4ad125a157683
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