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

2026-10-16 22:39:48 +00:00 · 2009-06-11 16:00:49 +02:00 · 2009-06-11 16:00:49 +02:00 · 36432dae73
commit 36432dae73
parent 440f0d5885 bb400801c2
520 changed files with 21172 additions and 11804 deletions
--- a/include/asm-generic/errno.h
+++ b/include/asm-generic/errno.h
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
--- a/include/linux/can/platform/sja1000.h
+++ b/include/linux/can/platform/sja1000.h
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
--- a/include/linux/in.h
+++ b/include/linux/in.h
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
--- a/include/linux/isdn/capilli.h
+++ b/include/linux/isdn/capilli.h
--- a/include/linux/mdio.h
+++ b/include/linux/mdio.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/netfilter/nf_conntrack_tcp.h
+++ b/include/linux/netfilter/nf_conntrack_tcp.h
--- a/include/linux/nl802154.h
+++ b/include/linux/nl802154.h
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
--- a/include/linux/spi/libertas_spi.h
+++ b/include/linux/spi/libertas_spi.h
--- a/include/linux/wimax.h
+++ b/include/linux/wimax.h
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
--- a/include/net/dst.h
+++ b/include/net/dst.h
--- a/include/net/ieee802154/af_ieee802154.h
+++ b/include/net/ieee802154/af_ieee802154.h
--- a/include/net/ieee802154/mac_def.h
+++ b/include/net/ieee802154/mac_def.h
--- a/include/net/ieee802154/netdevice.h
+++ b/include/net/ieee802154/netdevice.h
--- a/include/net/ieee802154/nl802154.h
+++ b/include/net/ieee802154/nl802154.h
--- a/include/net/inet6_hashtables.h
+++ b/include/net/inet6_hashtables.h
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
--- a/include/net/route.h
+++ b/include/net/route.h
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
--- a/include/net/sock.h
+++ b/include/net/sock.h
--- a/include/net/wimax.h
+++ b/include/net/wimax.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h