Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 13 Oct 2009 19:55:20 +0000 (12:55 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Oct 2009 19:55:20 +0000 (12:55 -0700)
commit421355de876b9f3fcc7e4cb6026e416fb12a5068
treefb814456af86c75e1eb9e330994dda461fc5b4f7
parentaace495933a981274b6491d71b915165a61defdc
parent0fe7463a35aadfaf22d1ca58325ab3851b8d757c
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
12 files changed:
MAINTAINERS
drivers/net/Kconfig
drivers/net/davinci_emac.c
drivers/net/ethoc.c
drivers/net/ixp2000/ixpdev.c
drivers/net/netxen/netxen_nic_main.c
drivers/net/r8169.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/libertas/cmdresp.c
include/net/sock.h
net/ipv4/udp.c