]> git.karo-electronics.de Git - mv-sheeva.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 3 Apr 2008 05:35:23 +0000 (22:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Apr 2008 05:35:23 +0000 (22:35 -0700)
commite1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a
tree4e1ca325dde22f1ac21c9da0be509e87e922e604
parentc0f39322c335412339dec16ebfd2a05ceba5ebcf
parent802fb176d8c635ae42da31b80841c26e8c7338a0
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
drivers/net/forcedeth.c
drivers/net/s2io.c
drivers/net/usb/dm9601.c
drivers/net/wan/lapbether.c
drivers/net/wireless/b43/dma.c
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/rt2x00/rt2x00dev.c
include/linux/netdevice.h
net/8021q/vlan.c
net/8021q/vlanproc.c
net/bluetooth/l2cap.c
net/bluetooth/rfcomm/sock.c
net/bluetooth/sco.c
net/ipv4/inet_fragment.c
net/ipv4/ip_forward.c
net/ipv4/udp.c
net/ipv6/addrconf.c
net/ipv6/icmp.c
net/ipv6/ip6_input.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/llc/af_llc.c
net/llc/llc_c_ac.c
net/llc/llc_input.c
net/mac80211/ieee80211.c
net/mac80211/ieee80211_sta.c
net/rose/af_rose.c