git.proxmox.com Git - mirror_ubuntu-kernels.git/commit

]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit

author	David S. Miller <davem@davemloft.net>
	Thu, 3 Apr 2008 05:35:23 +0000 (22:35 -0700)
committer	David S. Miller <davem@davemloft.net>
	Thu, 3 Apr 2008 05:35:23 +0000 (22:35 -0700)
commit	e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a
tree	4e1ca325dde22f1ac21c9da0be509e87e922e604	tree
parent	c0f39322c335412339dec16ebfd2a05ceba5ebcf	commit \| diff
parent	802fb176d8c635ae42da31b80841c26e8c7338a0	commit \| diff

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

Conflicts:

drivers/net/s2io.c

27 files changed:

drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/forcedeth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/s2io.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/dm9601.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/lapbether.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/dma.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00dev.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan.c	diff1 \|	diff2 \|	blob \| history
net/8021q/vlanproc.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/rfcomm/sock.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/sco.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_fragment.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_forward.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/nf_conntrack_reasm.c	diff1 \|	diff2 \|	blob \| history
net/llc/af_llc.c	diff1 \|	diff2 \|	blob \| history
net/llc/llc_c_ac.c	diff1 \|	diff2 \|	blob \| history
net/llc/llc_input.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_sta.c	diff1 \|	diff2 \|	blob \| history
net/rose/af_rose.c	diff1 \|	diff2 \|	blob \| history

Ubuntu combined Linux kernel mirror

drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/forcedeth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/s2io.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/dm9601.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/lapbether.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/dma.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00dev.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan.c	diff1 \|	diff2 \|	blob \| history
net/8021q/vlanproc.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/rfcomm/sock.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/sco.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_fragment.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_forward.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/nf_conntrack_reasm.c	diff1 \|	diff2 \|	blob \| history
net/llc/af_llc.c	diff1 \|	diff2 \|	blob \| history
net/llc/llc_c_ac.c	diff1 \|	diff2 \|	blob \| history
net/llc/llc_input.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_sta.c	diff1 \|	diff2 \|	blob \| history
net/rose/af_rose.c	diff1 \|	diff2 \|	blob \| history