Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 16 Dec 2008 04:03:50 +0000 (20:03 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Dec 2008 04:03:50 +0000 (20:03 -0800)
commiteb14f019597cd86c21a6c601d7e900f40030c2e7
tree36fb2f36a1747f98988f87215db1eef3a71d45eb
parent9a4a84294b0d60b8c287131478f743ba2bc68949
parenta3dd15444baa9c7522c8457ab564c41219dfb44c
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/e1000e/ich8lan.c
12 files changed:
MAINTAINERS
drivers/net/e1000e/ich8lan.c
drivers/net/sungem.c
fs/lockd/host.c
fs/nfsd/nfs4state.c
include/linux/netdevice.h
net/core/netpoll.c
net/ipv4/netfilter/nf_nat_rule.c
net/ipv6/ndisc.c
net/phonet/pep-gprs.c
net/sched/sch_netem.c
net/sunrpc/svcsock.c