David S. Miller eb14f01959 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/e1000e/ich8lan.c		2008-12-15 20:03:50 -08:00
..
clntlock.c	NLM: Remove "proto" argument from lockd_up()	2008-10-04 17:12:27 -04:00
clntproc.c
grace.c
host.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-12-15 20:03:50 -08:00
Makefile
mon.c	fs: replace NIPQUAD()	2008-10-31 00:56:28 -07:00
svc4proc.c	NLM: Set address family before calling nlm_host_rebooted()	2008-10-30 17:19:30 -04:00
svc.c	nfsd: clean up grace period on early exit	2008-11-24 10:12:48 -06:00
svclock.c
svcproc.c	NLM: Set address family before calling nlm_host_rebooted()	2008-10-30 17:19:30 -04:00
svcshare.c
svcsubs.c
xdr4.c	lockd: Remove unused fields in the nlm_reboot structure	2008-10-03 17:02:35 -04:00
xdr.c	lockd: Remove unused fields in the nlm_reboot structure	2008-10-03 17:02:35 -04:00