John W. Linville wrote:
A collection of minor changes, mostly bug fixes. This also includes
Adrian's hostap.c rename to hostap_main.c (acked by Jouni).
I went ahead and pulled-in my e1000 changes and my fec_8xx Kconfig
change. I don't think they are controversial. (I copied the e1000
guys on those patches, and they didn't scream. Someone from the PPC
camp acked the fec_8xx patch.)
Thanks,
John
---
The following changes since commit cd52d1ee9a92587b242d946a2300a3245d3b885a:
Linus Torvalds:
Linux v2.6.15-rc1
are found in the git repository at:
git://git.tuxdriver.com/git/netdev-jwl.git upstream-jgarzik
Adrian Bunk:
drivers/net/sk98lin/skge.c: make SkPciWriteCfgDWord() a static inline
hostap: rename hostap.c to hostap_main.c
Carlo Perassi:
atmel: CodingStyle cleanup
Christophe Lucas:
atmel: audit return code of create_proc_read_entry
James Ketrenos:
ipw2100: Fix 'Driver using old /proc/net/wireless...' message
John W. Linville:
e1000: avoid leak when e1000_setup_loopback_test fails
e1000: zero-out pointers in e1000_free_desc_rings
all of the above OK
fec_8xx: make CONFIG_FEC_8XX depend on CONFIG_8xx
unneeded, now? the fix to require CONFIG_FEC already went in.
skge: fix warning from inlining SkPciWriteCfgDWord()
Merge branch 'linville-e1000'
Merge branch 'linville-fec_8xx'
you can use 'git log --no-merges' to eliminate listing these.
Krzysztof Halasa:
Generic HDLC WAN drivers - disable netif_carrier_off()
Tobias Klauser:
Remove drivers/net/wan/lmc/lmc_prot.h
OK
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
