Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Tue, 13 Oct 2009 19:55:20 +0000 (12:55 -0700)]
12 files changed:
1  2 
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

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/udp.c
Simple merge