David S. Miller b262e60309 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/net/wireless/ath9k/core.c
	drivers/net/wireless/ath9k/main.c
	net/core/dev.c

2008-10-01 06:12:56 -07:00

..

b43.h

b43: fix QoS parameters initialization

2008-09-15 16:48:25 -04:00

debugfs.c

b43: Implement dynamic PHY API

2008-08-29 16:24:12 -04:00

debugfs.h

b43: Add debugfs firmware debugging knob

2008-06-27 09:09:16 -04:00

dma.c

ssb, b43, b43legacy, b44: Rewrite SSB DMA API

2008-06-27 09:09:15 -04:00

dma.h

mac80211: move TX info into skb->cb

2008-05-21 21:48:11 -04:00

Kconfig

b43: Add LP-PHY template

2008-09-05 16:17:43 -04:00

leds.c

b43: Fix possible MMIO access while device is down

2008-06-25 10:55:09 -04:00

leds.h

…

lo.c

b43: Implement dynamic PHY API

2008-08-29 16:24:12 -04:00

lo.h

b43: Implement dynamic PHY API

2008-08-29 16:24:12 -04:00

main.c

b43: Increase loop tries in do_dummy_tx

2008-09-30 14:07:25 -04:00

main.h

b43: Add debugfs files for random SHM access

2008-06-26 16:49:18 -04:00

Makefile

b43: Add LP-PHY template

2008-09-05 16:17:43 -04:00

pcmcia.c

…

pcmcia.h

…

phy_a.c

b43: Move Analog switching into phy code

2008-09-08 14:00:16 -04:00

phy_a.h

b43: Split PHY alloc and init

2008-09-05 16:17:49 -04:00

phy_common.c

mac80211: use nl80211 interface types

2008-09-15 16:48:23 -04:00

phy_common.h

b43: Move Analog switching into phy code

2008-09-08 14:00:16 -04:00

phy_g.c

b43 G-PHY: Remove mmiowb()

2008-09-11 15:53:32 -04:00

phy_g.h

b43: Split PHY alloc and init

2008-09-05 16:17:49 -04:00

phy_lp.c

b43: Move Analog switching into phy code

2008-09-08 14:00:16 -04:00

phy_lp.h

b43: Split PHY alloc and init

2008-09-05 16:17:49 -04:00

phy_n.c

b43: Move Analog switching into phy code

2008-09-08 14:00:16 -04:00

phy_n.h

b43: Split PHY alloc and init

2008-09-05 16:17:49 -04:00

pio.c

b43: Fix PIO skb clobber

2008-06-27 09:09:19 -04:00

pio.h

mac80211: move TX info into skb->cb

2008-05-21 21:48:11 -04:00

rfkill.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-10-01 06:12:56 -07:00

rfkill.h

…

sysfs.c

b43: Implement dynamic PHY API

2008-08-29 16:24:12 -04:00

sysfs.h

…

tables_nphy.c

b43: Move code from nphy.* to phy_n.*

2008-09-05 16:17:43 -04:00

tables_nphy.h

…

tables.c

b43: Implement dynamic PHY API

2008-08-29 16:24:12 -04:00

tables.h

…

wa.c

b43: Implement dynamic PHY API

2008-08-29 16:24:12 -04:00

wa.h

…

xmit.c

b43: Rewrite TX power adjustment

2008-08-29 16:24:13 -04:00

xmit.h

mac80211: move TX info into skb->cb

2008-05-21 21:48:11 -04:00