]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit67fd4e116dab849e2cd9ac8fd7c7068eabf1df95
treefb814456af86c75e1eb9e330994dda461fc5b4f7
parentf4314d57fa4f503131798b29e30292af1cfdc6d9
parent418588d5dbae5c7eaafc81a4382fcc3e444661d7
Merge branch 'master' of master.kernel.org:/pub/scm/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