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
..
datagram.c	[NET]: Replace CHECKSUM_HW by CHECKSUM_PARTIAL/CHECKSUM_COMPLETE	2006-09-22 14:53:53 -07:00
dev_mcast.c	[NET]: Remove unnecessary config.h includes from net/	2006-09-22 14:54:21 -07:00
dev.c	[NET] netdev: Check name length	2006-09-22 14:54:35 -07:00
dst.c	[NET]: add_timer -> mod_timer() in dst_run_gc()	2006-08-09 02:25:54 -07:00
dv.c
ethtool.c	[PATCH] ethtool: allow const ethtool_ops	2006-09-13 13:30:47 -04:00
fib_rules.c	[NETLINK]: Make use of NLA_STRING/NLA_NUL_STRING attribute validation	2006-09-22 15:18:25 -07:00
filter.c	[NET]: Fix sk->sk_filter field access	2006-09-22 15:18:47 -07:00
flow.c	[NET]: Use SLAB_PANIC	2006-09-22 15:18:19 -07:00
gen_estimator.c
gen_stats.c
iovec.c
link_watch.c
Makefile	[NET]: Protocol Independant Policy Routing Rules Framework	2006-09-22 14:53:40 -07:00
neighbour.c	[IPV6] NDISC: Set per-entry is_router flag in Proxy NA.	2006-09-22 15:20:24 -07:00
net-sysfs.c
netevent.c	[NET]: Network Event Notifier Mechanism.	2006-08-02 13:38:20 -07:00
netpoll.c	[NET]: Replace CHECKSUM_HW by CHECKSUM_PARTIAL/CHECKSUM_COMPLETE	2006-09-22 14:53:53 -07:00
pktgen.c	[IPV6] ADDRCONF: Convert addrconf_lock to RCU.	2006-09-22 15:20:26 -07:00
request_sock.c
rtnetlink.c	[RTNETLINK]: Fix netdevice name corruption	2006-09-22 15:18:50 -07:00
scm.c
skbuff.c	[NET]: Use SLAB_PANIC	2006-09-22 15:18:19 -07:00
sock.c	[NET]: Fix sk->sk_filter field access	2006-09-22 15:18:47 -07:00
stream.c	[NET]: fix __sk_stream_mem_reclaim	2006-07-12 17:58:53 -07:00
sysctl_net_core.c
user_dma.c	[I/OAT]: net/core/user_dma.c should #include <net/netdma.h>	2006-07-21 14:49:49 -07:00
utils.c	[NET] in6_pton: Kill errant printf statement.	2006-09-22 15:18:02 -07:00
wireless.c	[WIRELESS]: Convert notifications to use rtnl_notify()	2006-09-22 14:55:00 -07:00