John W. Linville 655d8e2328 Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next ...

Conflicts:
	drivers/net/wireless/ath/carl9170/debug.c
	drivers/net/wireless/ath/carl9170/main.c
	net/mac80211/ieee80211_i.h

2013-04-10 14:09:54 -04:00

..

wl12xx

wlcore: set max num of Rx BA sessions per chip

2013-03-25 12:33:11 +02:00

wl18xx

wl18xx: print chip info during boot

2013-03-25 12:33:12 +02:00

wl1251

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2013-04-10 14:09:54 -04:00

wlcore

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2013-04-10 14:09:54 -04:00

Kconfig

wlcore: move wl12xx_platform_data up and make it truly optional

2013-02-08 10:05:02 +02:00

Makefile

wlcore: move wl12xx_platform_data up and make it truly optional

2013-02-08 10:05:02 +02:00

wilink_platform_data.c

wlcore: move wl12xx_platform_data up and make it truly optional

2013-02-08 10:05:02 +02:00