Greg Kroah-Hartman 32235b07b5 Staging: merge 2.6.39-rc3 into staging-next ... This was done to handle a number of conflicts, the majority of which were caused by the big "fix spelling issues" patch. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2011-04-13 12:14:05 -07:00
..
bmi	ath6kl: s|A_FREE|kfree|g	2011-04-04 22:58:02 -07:00
hif	ath6kl: remove chatty debug messages on ath6kl driver ops	2011-04-04 22:58:17 -07:00
htc2	Staging: merge 2.6.39-rc3 into staging-next	2011-04-13 12:14:05 -07:00
include	Staging: merge 2.6.39-rc3 into staging-next	2011-04-13 12:14:05 -07:00
miscdrv	Staging: merge 2.6.39-rc3 into staging-next	2011-04-13 12:14:05 -07:00
os/linux	Staging: merge 2.6.39-rc3 into staging-next	2011-04-13 12:14:05 -07:00
reorder	ath6kl: remove define ATH_AR6K_11N_SUPPORT	2011-04-04 22:58:07 -07:00
wlan	ath6kl: remove dependency on LINUX and KERNEL_2_6 macros	2011-04-04 22:58:07 -07:00
wmi	Staging: merge 2.6.39-rc3 into staging-next	2011-04-13 12:14:05 -07:00
Kconfig	ath6kl: remove all the wext and super extended private ioctl crap	2011-04-04 22:58:06 -07:00
Makefile	ath6kl: use CONFIG_ATH6KL_ENABLE_COEXISTENCE	2011-04-04 22:58:13 -07:00
TODO	staging: ath6kl: update TODO file / maintainers	2011-02-23 13:59:56 -08:00