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

Conflicts: Documentation/isdn/00-INDEX drivers/net/wireless/iwlwifi/iwl-scan.c drivers/net/wireless/rndis_wlan.c net/mac80211/main.c
2026-09-26 18:16:26 +00:00 · 2009-04-29 20:30:35 -07:00 · 2009-04-29 20:30:35 -07:00 · aba7453037
commit aba7453037
parent a4fe91ee71 93af7aca44
38 changed files with 824 additions and 470 deletions
--- a/Documentation/isdn/00-INDEX
+++ b/Documentation/isdn/00-INDEX
--- a/Documentation/isdn/INTERFACE.CAPI
+++ b/Documentation/isdn/INTERFACE.CAPI
--- a/drivers/isdn/capi/kcapi.c
+++ b/drivers/isdn/capi/kcapi.c
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/linux/netfilter/nfnetlink_conntrack.h
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
--- a/net/netfilter/nf_conntrack_proto_dccp.c
+++ b/net/netfilter/nf_conntrack_proto_dccp.c
--- a/net/netfilter/nf_conntrack_proto_udplite.c
+++ b/net/netfilter/nf_conntrack_proto_udplite.c
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c