[just sent this to Andrew/Linus]
Please pull from 'upstream' branch of
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
to obtain the various updates described below:
drivers/net/Kconfig | 7
drivers/net/Makefile | 2
drivers/net/ac3200.c | 2
drivers/net/atarilance.c | 2
drivers/net/dm9000.c | 2
drivers/net/forcedeth.c | 4
drivers/net/iseries_veth.c | 1
drivers/net/s2io-regs.h | 13
drivers/net/s2io.c | 98 -
drivers/net/s2io.h | 5
drivers/net/spider_net.c | 2334 ++++++++++++++++++++++++++++++
drivers/net/spider_net.h | 469 ++++++
drivers/net/spider_net_ethtool.c | 126 +
drivers/net/sun3lance.c | 2
drivers/net/wireless/airo.c | 43
drivers/net/wireless/atmel.c | 17
drivers/net/wireless/ipw2200.c | 2264 ++++++++++++++---------------
drivers/net/wireless/ipw2200.h | 408 ++---
drivers/net/wireless/netwave_cs.c | 7
drivers/net/wireless/prism54/isl_ioctl.c | 3
drivers/net/wireless/prism54/islpci_dev.c | 3
drivers/net/wireless/ray_cs.c | 858 +++++------
drivers/net/wireless/ray_cs.h | 7
drivers/net/wireless/wl3501.h | 1
drivers/net/wireless/wl3501_cs.c | 7
drivers/s390/net/claw.c | 20
include/linux/pci_ids.h | 1
include/linux/wireless.h | 38
include/net/iw_handler.h | 123 +
net/core/wireless.c | 58
net/ieee80211/ieee80211_crypt.c | 27
net/ieee80211/ieee80211_crypt_ccmp.c | 47
net/ieee80211/ieee80211_crypt_tkip.c | 131 -
net/ieee80211/ieee80211_crypt_wep.c | 30
net/ieee80211/ieee80211_module.c | 40
net/ieee80211/ieee80211_rx.c | 310 ++-
net/ieee80211/ieee80211_tx.c | 66
net/ieee80211/ieee80211_wx.c | 73
38 files changed, 5350 insertions(+), 2299 deletions(-)
Al Viro:
lvalues abuse in lance
Frank Pavlic:
s390: claw driver fixes
Jean Tourrilhes:
WE-19 for kernel 2.6.13
ray_cs : WE-17 support
iw263_netwave_we17.diff
atmel_cs : WE-17 support
wl3501_cs : WE-17 support
prism54 : WE-17 support
airo : WE-19 support
Jeff Garzik:
[wireless] build fixes after merging WE-19
[wireless ieee80211,ipw2200] Lindent source code
>>
>> NOTE: As explained in the full cset description, this Lindent
>> will help us sync up Intel, and as a side effect make the code
>> look better.
>>
Jens Osterkamp:
net: add driver for the NIC on Cell Blades
net: update the spider_net driver
net: fix bonding with spider_net
Michael Ellerman:
iseries_veth: Update copyright notice
[email protected]:
S2io: Hardware and miscellaneous fixes
[email protected]:
iomem annotations (ac3200.c)
missed s/u32/pm_message_t/ (dm9000)
__user annotations (forcedeth.c)
[patch snipped]
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
|
|