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

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

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

author	David S. Miller <davem@davemloft.net>
	Fri, 10 Sep 2010 05:27:33 +0000 (22:27 -0700)
committer	David S. Miller <davem@davemloft.net>
	Fri, 10 Sep 2010 05:27:33 +0000 (22:27 -0700)
commit	e548833df83c3554229eff0672900bfe958b45fd
tree	85efc4a76dc356593d6d394776aeb845dc580fb6	tree \| snapshot (tar.bz2 tar.gz zip)
parent	cbd9da7be869f676afc204e1a664163778c770bd	commit \| diff
parent	053d8f6622701f849fda2ca2c9ae596c13599ba9	commit \| diff

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

Conflicts:
net/mac80211/main.c

38 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/firewire/net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/3c59x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/b44.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be.h	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/niu.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/pcnet_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pxa168_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlcnic/qlcnic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/via-velocity.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/atm/cxacru.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/caif/cfrfml.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/Kconfig	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_timer.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/nf_conntrack_reasm.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/reassembly.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_eth.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_core.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_statefuns.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/wext-core.c	diff1 \|	diff2 \|	blob \| history

Clone of davem's net-next-2.6 tree

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/firewire/net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/3c59x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/b44.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be.h	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/niu.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/pcnet_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pxa168_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlcnic/qlcnic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/via-velocity.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/atm/cxacru.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/caif/cfrfml.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/Kconfig	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_timer.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/nf_conntrack_reasm.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/reassembly.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_eth.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_core.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_statefuns.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/wext-core.c	diff1 \|	diff2 \|	blob \| history