projects / profile / ivi / kernel-x86-ivi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 560ab42 405d8f8)
Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6...
authorJ. Bruce Fields <bfields@citi.umich.edu>
Fri, 21 Aug 2009 15:27:29 +0000 (11:27 -0400)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Fri, 21 Aug 2009 15:27:29 +0000 (11:27 -0400)
commite9dc122166b8d863d3057a66ada04838e5548e52
tree749e15bf719b64bf9113db7acd8e043d9742cb26tree | snapshot
parent560ab42ef923aaf2e4347315bdfcc74b2708972ccommit | diff
parent405d8f8b1d936414da2093d4149ff790ff3f84a5commit | diff
Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 into for-2.6.32-incoming

Conflicts:
net/sunrpc/cache.c
fs/nfsd/nfsctl.c diff1 | diff2 | blob | history
fs/nfsd/nfssvc.c diff1 | diff2 | blob | history
net/sunrpc/cache.c diff1 | diff2 | blob | history
net/sunrpc/svcauth_unix.c diff1 | diff2 | blob | history
Domain: System / Uncategorized;