John W. Linville 95a943c162 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem ...

Conflicts:
	net/bluetooth/l2cap_core.c

2011-07-15 10:05:24 -04:00

..

acx.c

wl12xx: always initialize AP-mode max power level

2011-07-05 21:51:05 +03:00

acx.h

…

boot.c

…

boot.h

…

cmd.c

Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx

2011-07-08 11:05:20 -04:00

cmd.h

…

conf.h

…

debugfs.c

wl12xx: start/stop queues according to global per-AC counters

2011-07-08 09:39:47 +03:00

debugfs.h

…

event.c

…

event.h

…

ini.h

…

init.c

wl12xx: always initialize AP-mode max power level

2011-07-05 21:51:05 +03:00

init.h

…

io.c

…

io.h

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2011-07-08 11:03:36 -04:00

Kconfig

…

main.c

wl12xx: start/stop queues according to global per-AC counters

2011-07-08 09:39:47 +03:00

Makefile

…

ps.c

wl12xx: start/stop queues according to global per-AC counters

2011-07-08 09:39:47 +03:00

ps.h

…

reg.h

…

rx.c

…

rx.h

…

scan.c

wl12xx: add stop_scan command

2011-07-05 21:50:39 +03:00

scan.h

wl12xx: add stop_scan command

2011-07-05 21:50:39 +03:00

sdio_test.c

…

sdio.c

…

spi.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2011-07-08 11:03:36 -04:00

testmode.c

…

testmode.h

…

tx.c

wl12xx: start/stop queues according to global per-AC counters

2011-07-08 09:39:47 +03:00

tx.h

wl12xx: start/stop queues according to global per-AC counters

2011-07-08 09:39:47 +03:00

wl12xx_80211.h

…

wl12xx_platform_data.c

…

wl12xx.h

wl12xx: start/stop queues according to global per-AC counters

2011-07-08 09:39:47 +03:00