Linus Torvalds 9028780a3e 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: (40 commits) [netdrvr] atl1: fix build pasemi_mac: Use local-mac-address instead of mac-address if available pasemi_mac: PHY support pasemi_mac: Add msglevel support and "debug" module param pasemi_mac: Logic cleanup / rx performance improvements pasemi_mac: Minor cleanup / define fixes pasemi_mac: Add SKB reuse / copy-break pasemi_mac: Timer and interrupt fixes pasemi_mac: Abstract and fix up interrupt restart routines pasemi_mac: Move the IRQ mapping from the PCI layer to the driver tc35815: Remove unnecessary skb->dev assignment drivers/net/dm9000: Convert to generic boolean AT91RM9200 Ethernet: Fix multicast addressing AT91RM9200 Ethernet: Support additional PHYs PCMCIA-NETDEV : xirc2ps_cs: bugfix of multicast code sky2: re-enable 88E8056 for most motherboards MIPS: Drop unnecessary CONFIG_ISA from RBTX49XX ne: MIPS: Use platform_driver for ne on RBTX49XX ne: Add NEEDS_PORTLIST to control ISA auto-probe ne: Misc fixes for platform driver. ... Fix conflict in drivers/net/pasemi_mac.c (get_property() got renamed to of_get_property()) manually. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2007-05-08 11:57:17 -07:00
..
bcm43xx	[PATCH] bcm43xx: Change initialization for 2050 radios	2007-04-28 11:01:03 -04:00
hostap	header cleaning: don't include smp_lock.h when not used	2007-05-08 11:15:07 -07:00
libertas	[PATCH] libertas: use standard kernel macros	2007-04-28 11:01:00 -04:00
prism54	[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}	2007-04-25 22:28:29 -07:00
zd1211rw	[PATCH] zd1211rw: Add ID for ZyXEL AG-220	2007-04-28 11:01:04 -04:00
airo_cs.c
airo.c	header cleaning: don't include smp_lock.h when not used	2007-05-08 11:15:07 -07:00
airo.h
airport.c
arlan-main.c	[ETH]: Make eth_type_trans set skb->dev like the other *_type_trans	2007-04-25 22:24:30 -07:00
arlan-proc.c	[PATCH] sysctl: remove insert_at_head from register_sysctl	2007-02-14 08:09:59 -08:00
arlan.h
atmel_cs.c
atmel_pci.c
atmel.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
atmel.h
hermes_rid.h
hermes.c
hermes.h
i82586.h
i82593.h
ipw2100.c	[PATCH] Update my email address from jkmaline@cc.hut.fi to j@w1.fi	2007-04-28 11:01:01 -04:00
ipw2100.h
ipw2200.c	[PATCH] ipw2200: fix ieee80211_get_geo typo	2007-04-28 11:00:55 -04:00
ipw2200.h
Kconfig	libertas: fix for wireless Kconfig changes	2007-05-08 01:20:15 -04:00
Makefile	[PATCH] Marvell Libertas 8388 802.11b/g USB driver	2007-04-28 11:00:54 -04:00
netwave_cs.c	[ETH]: Make eth_type_trans set skb->dev like the other *_type_trans	2007-04-25 22:24:30 -07:00
orinoco_cs.c	Network: convert network devices to use struct device instead of class_device	2007-02-07 10:37:11 -08:00
orinoco_nortel.c
orinoco_pci.c
orinoco_pci.h
orinoco_plx.c
orinoco_tmd.c
orinoco.c	[SK_BUFF]: Introduce skb_mac_header()	2007-04-25 22:24:41 -07:00
orinoco.h
ray_cs.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
ray_cs.h
rayctl.h
spectrum_cs.c	Network: convert network devices to use struct device instead of class_device	2007-02-07 10:37:11 -08:00
strip.c	[NET]: Rework dev_base via list_head (v3)	2007-05-03 15:13:45 -07:00
wavelan_cs.c	[SK_BUFF]: Introduce skb_mac_header()	2007-04-25 22:24:41 -07:00
wavelan_cs.h
wavelan_cs.p.h
wavelan.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
wavelan.h
wavelan.p.h	[PATCH] wavelan: Use ARRAY_SIZE macro when appropriate	2007-02-14 15:45:04 -05:00
wl3501_cs.c	net: remove a collection of unneeded #undef REALLY_SLOW_IO stuff	2007-02-27 04:30:42 -05:00
wl3501.h
zd1201.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
zd1201.h