Linus Torvalds a319a2773a Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 ... * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (217 commits) net/ieee80211: fix more crypto-related build breakage [PATCH] Spidernet: add ethtool -S (show statistics) [NET] GT96100: Delete bitrotting ethernet driver [PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM [PATCH] Cirrus Logic ep93xx ethernet driver r8169: the MMIO region of the 8167 stands behin BAR#1 e1000, ixgb: Remove pointless wrappers [PATCH] Remove powerpc specific parts of 3c509 driver [PATCH] s2io: Switch to pci_get_device [PATCH] gt96100: move to pci_get_device API [PATCH] ehea: bugfix for register access functions [PATCH] e1000 disable device on PCI error drivers/net/phy/fixed: #if 0 some incomplete code drivers/net: const-ify ethtool_ops declarations [PATCH] ethtool: allow const ethtool_ops [PATCH] sky2: big endian [PATCH] sky2: fiber support [PATCH] sky2: tx pause bug fix drivers/net: Trim trailing whitespace [PATCH] ehea: IBM eHEA Ethernet Device Driver ... Manually resolved conflicts in drivers/net/ixgb/ixgb_main.c and drivers/net/sky2.c related to CHECKSUM_HW/CHECKSUM_PARTIAL changes by commit 84fa7933a3 that just happened to be next to unrelated changes in this update.		2006-09-24 10:15:13 -07:00
..
bluetooth
irda
netfilter
sctp	[SCTP]: Cleanups	2006-09-22 15:19:03 -07:00
tc_act
tipc
act_api.h
addrconf.h	[IPV6] ADDRCONF: Mobile IPv6 Home Address support.	2006-09-22 15:20:29 -07:00
af_unix.h
ah.h
arp.h
atmclip.h
ax25.h
checksum.h
cipso_ipv4.h	[NetLabel]: add some missing #includes to various header files	2006-09-22 15:18:39 -07:00
compat.h
datalink.h
dn_dev.h
dn_fib.h
dn_neigh.h
dn_nsp.h
dn_route.h
dn.h
dsfield.h
dst.h
esp.h
fib_rules.h
flow.h
gen_stats.h
genetlink.h	[GENL]: Provide more information to userspace about registered genl families	2006-09-22 15:18:51 -07:00
icmp.h
ieee80211_crypt.h
ieee80211_radiotap.h
ieee80211.h
ieee80211softmac_wx.h
ieee80211softmac.h
if_inet6.h	[IPV6] ADDRCONF: Convert addrconf_lock to RCU.	2006-09-22 15:20:26 -07:00
inet6_connection_sock.h
inet6_hashtables.h
inet_common.h
inet_connection_sock.h	[TCP]: Send ACKs each 2nd received segment.	2006-09-22 15:19:05 -07:00
inet_ecn.h
inet_hashtables.h
inet_sock.h
inet_timewait_sock.h
inetpeer.h
ip6_checksum.h
ip6_fib.h
ip6_route.h	[NETFILTER]: ip6table_mangle: reroute when nfmark changes in NF_IP6_LOCAL_OUT	2006-09-22 15:19:51 -07:00
ip6_tunnel.h
ip_fib.h
ip_mp_alg.h
ip_vs.h
ip.h
ipcomp.h
ipconfig.h
ipip.h
ipv6.h
ipx.h
iw_handler.h
lapb.h
llc_c_ac.h
llc_c_ev.h
llc_c_st.h
llc_conn.h
llc_if.h
llc_pdu.h
llc_s_ac.h
llc_s_ev.h
llc_s_st.h
llc_sap.h
llc.h
mip6.h
ndisc.h
neighbour.h	[IPV6] NDISC: Set per-entry is_router flag in Proxy NA.	2006-09-22 15:20:24 -07:00
netdma.h
netevent.h
netlabel.h	[NetLabel]: add some missing #includes to various header files	2006-09-22 15:18:39 -07:00
netlink.h
netrom.h
nexthop.h
p8022.h
pkt_cls.h
pkt_sched.h
protocol.h
psnap.h
raw.h
rawv6.h
red.h
request_sock.h
rose.h
route.h
sch_generic.h
scm.h
slhc_vj.h
snmp.h
sock.h	[NET]: Fix sk->sk_filter field access	2006-09-22 15:18:47 -07:00
syncppp.h
tcp_ecn.h
tcp_states.h
tcp.h
timewait_sock.h
transp_v6.h
udp.h
x25.h
x25device.h
xfrm.h	[XFRM]: Fix wildcard as tunnel source	2006-09-22 15:19:06 -07:00