android_kernel_xiaomi_sm8350/fs/lockd
David S. Miller 9eeda9abd1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c
2008-11-06 22:43:03 -08:00
..
clntlock.c NLM: Remove "proto" argument from lockd_up() 2008-10-04 17:12:27 -04:00
clntproc.c lockd: dont return EAGAIN for a permanent error 2008-07-25 10:53:47 -07:00
grace.c nfsd: common grace period control 2008-10-03 16:19:02 -04:00
host.c fs: replace NIPQUAD() 2008-10-31 00:56:28 -07:00
Makefile nfsd: common grace period control 2008-10-03 16:19:02 -04:00
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 NLM: Remove "proto" argument from lockd_up() 2008-10-04 17:12:27 -04:00
svclock.c lockd: reject reclaims outside the grace period 2008-10-03 16:19:20 -04:00
svcproc.c NLM: Set address family before calling nlm_host_rebooted() 2008-10-30 17:19:30 -04:00
svcshare.c
svcsubs.c lockd: Teach nlm_cmp_addr() to support AF_INET6 addresses 2008-09-29 18:13:39 -04:00
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