bbs.cooldavid.org Git - net-next-2.6.git/commit

]> bbs.cooldavid.org Git - net-next-2.6.git/commit

author	David S. Miller <davem@davemloft.net>
	Mon, 27 Sep 2010 08:03:03 +0000 (01:03 -0700)
committer	David S. Miller <davem@davemloft.net>
	Mon, 27 Sep 2010 08:03:03 +0000 (01:03 -0700)
commit	e40051d134f7ee95c8c1f7a3471e84eafc9ab326
tree	88eb44e49a75721ae926665a2c42f08badac9d07	tree \| snapshot (tar.bz2 tar.gz zip)
parent	42099d7a3941d4aaf853caac92b3ae76149fc6e7	commit \| diff
parent	2cc6d2bf3d6195fabcf0febc192c01f99519a8f3	commit \| diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/qlcnic/qlcnic_init.c
net/ipv4/ip_output.c

29 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/3c59x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/atlx/atl1.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_3ad.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb3/cxgb3_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ibm_newemac/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlcnic/qlcnic_init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smsc911x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/hso.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.c	diff1 \|	diff2 \|	blob \| history
include/net/addrconf.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrlabel.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_connect.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_listen.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_recv.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_send.c	diff1 \|	diff2 \|	blob \| history
net/sctp/output.c	diff1 \|	diff2 \|	blob \| history

Clone of davem's net-next-2.6 tree

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/3c59x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/atlx/atl1.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_3ad.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb3/cxgb3_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ibm_newemac/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlcnic/qlcnic_init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smsc911x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/hso.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.c	diff1 \|	diff2 \|	blob \| history
include/net/addrconf.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrlabel.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_connect.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_listen.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_recv.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_send.c	diff1 \|	diff2 \|	blob \| history
net/sctp/output.c	diff1 \|	diff2 \|	blob \| history