I have just updated the netdev queue, merging several branches into the
upstream-2.6.13 branch. Here are the branches that remain:
chelsio ieee80211-wifi master register-netdev smc91x-eeprom
ieee80211 janitor misc-fixes upstream-2.6.13
Notes for Andrew:
* we18 is now included in upstream-2.6.13. so, iee80211* got renamed.
* master is always vanilla upstream, and can be ignored.
* misc-fixes was just sent to Linus
For all:
This is the contents of the 'upstream-2.6.13' branch of
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
drivers/net/fmv18x.c | 689 ------
drivers/net/sk_g16.c | 2045 ------------------
drivers/net/sk_g16.h | 164 -
Documentation/networking/generic-hdlc.txt | 43
Documentation/networking/multicast.txt | 1
Documentation/networking/net-modules.txt | 3
drivers/net/8139cp.c | 100
drivers/net/8139too.c | 194 -
drivers/net/Kconfig | 47
drivers/net/Makefile | 4
drivers/net/Space.c | 6
drivers/net/arm/etherh.c | 16
drivers/net/au1000_eth.c | 10
drivers/net/bmac.c | 2
drivers/net/dm9000.c | 1219 ++++++++++
drivers/net/dm9000.h | 135 +
drivers/net/pcmcia/pcnet_cs.c | 17
drivers/net/ppp_generic.c | 175 -
drivers/net/r8169.c | 343 ++-
drivers/net/sk98lin/skge.c | 8
drivers/net/skge.c | 3386 ++++++++++++++++++++++++++++++
drivers/net/skge.h | 3005 ++++++++++++++++++++++++++
drivers/net/smc91x.c | 58
drivers/net/smc91x.h | 15
drivers/net/starfire.c | 142 -
drivers/net/starfire_firmware.h | 346 +++
drivers/net/tlan.c | 4
drivers/net/tokenring/ibmtr.c | 11
drivers/net/wan/hdlc_fr.c | 318 +-
drivers/net/wan/hdlc_generic.c | 16
drivers/net/wan/lmc/lmc_main.c | 8
drivers/net/wireless/orinoco.c | 332 --
drivers/net/wireless/orinoco.h | 1
include/linux/dm9000.h | 36
include/linux/hdlc.h | 4
include/linux/if.h | 2
include/linux/wireless.h | 283 ++
net/core/wireless.c | 74
38 files changed, 9435 insertions(+), 3827 deletions(-)
<[email protected]>:
8139cp net driver: add MODULE_VERSION
<[email protected]>:
Automatic merge of /spare/repo/netdev-2.6 branch skge
Automatic merge of /spare/repo/netdev-2.6 branch starfire
Automatic merge of /spare/repo/netdev-2.6 branch smc91x
Automatic merge of /spare/repo/netdev-2.6 branch remove-drivers
Automatic merge of /spare/repo/netdev-2.6 branch iff-running
Automatic merge of /spare/repo/netdev-2.6 branch we18
Automatic merge of /spare/repo/netdev-2.6 branch viro
Automatic merge of /spare/repo/netdev-2.6 branch r8169
Automatic merge of /spare/repo/netdev-2.6 branch orinoco-hch
Automatic merge of /spare/repo/netdev-2.6 branch ppp
Automatic merge of /spare/repo/netdev-2.6 branch hdlc
Automatic merge of /spare/repo/netdev-2.6 branch dm9000
Automatic merge of /spare/repo/netdev-2.6 branch 8139too-iomap
Automatic merge of /spare/repo/netdev-2.6 branch 8139cp
Automatic merge of /spare/repo/netdev-2.6 branch master
Automatic merge of rsync://www.fr.zoreil.com/linux-2.6.git branch HEAD
Automatic merge of rsync://rsync.kernel.org/.../torvalds/linux-2.6.git branch HEAD
Automatic merge of rsync://rsync.kernel.org/.../torvalds/linux-2.6.git branch HEAD
<[email protected]>:
[PATCH] Wireless Extensions 18 (aka WPA)
<[email protected]>:
[netdrvrs] Use netif_carrier_* instead of IFF_RUNNING
Adrian Bunk <[email protected]>:
[PATCH] remove two obsolete net drivers
Al Viro <[email protected]>:
pcnet_cs cleanup
etherh iomem annotations
skge missing include
skge 64bit portability
Christoph Hellwig <[email protected]>:
orinoco: make orinoco_stop() static
orinoco: disconnect the network device on reset errors
orinoco: misc fixes
orinoco: Symbol 3.0x firmware needs broken_disableport
orinoco: fix setting of 32 character ESSIDs
David Gibson <[email protected]>:
[PATCH] Orinoco: consolidate allocation code
[PATCH] Orinoco: don't set channel in managed mode
[PATCH] Orinoco: kill dump_recs
[PATCH] Orinoco: ignore_disconnect flag
[PATCH] Orinoco: wireless stats updates
Francois Romieu <[email protected]>:
r8169: add module parameter (media)
r8169: de-obfuscate supported PCI ID
r8169: new PCI id
[PATCH] r8169: incoming frame length check
[PATCH] 8139cp: SG support fixes
Jeff Garzik <[email protected]>:
[netdrvr starfire] Add GPL'd firmware, remove compat code
[netdrvr 8139cp] TSO support
Krzysztof Halasa <[email protected]>:
Generic HDLC update
Nicolas Pitre <[email protected]>:
smc91x: more tweaks to help with RX overruns
smc91x: improve diagnostic info
[PATCH] smc91x warning fix
[PATCH] smc91x addr config check
Paul Mackerras <[email protected]>:
[PATCH] PPP multilink fragmentation improvements
Pekka Enberg <[email protected]>:
[PATCH] 8139too: use iomap for pio/mmio
Richard Dawe <[email protected]>:
r8169: minor cleanup
Sascha Hauer <[email protected]>:
DM9000 network driver
Steffen Klassert <[email protected]>:
[PATCH] 8139cp - add netpoll support
Stephen Hemminger <[email protected]>:
r8169: add ethtool support for dumping the chip statistics
r8169: ethtool message level control support
r8169: add module parameter (copybreak)
r8169: identify the napi version
[netdrvr] new driver skge, for SysKonnect cards
[PATCH] 8139cp - module_param
-
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]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
