Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
ar9170	ar9170: Remove MODULE_FIRMWARE references to two-stage firmware	2010-10-05 13:35:22 -04:00
ath5k	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
ath9k	ath9k_htc: Fix suspend/resume	2010-12-08 15:23:47 -05:00
carl9170	carl9170: fix carl9170_tx_prepare typo	2010-11-29 14:41:29 -05:00
ath.h	ath9k_hw: move the cycle counter tracking to ath	2010-10-11 15:04:20 -04:00
debug.c	ath5k: fix build break from "ath5k: Print out opmode in debugfs"	2010-10-12 16:05:30 -04:00
debug.h	ath5k: fix build break from "ath5k: Print out opmode in debugfs"	2010-10-12 16:05:30 -04:00
hw.c	ath9k_hw: move the cycle counter tracking to ath	2010-10-11 15:04:20 -04:00
Kconfig	carl9170: Makefile, Kconfig files and MAINTAINERS	2010-09-14 16:03:42 -04:00
key.c	ath/ath9k: Replace common->splitmic with a flag	2010-09-16 15:19:45 -04:00
main.c
Makefile	ath: Copy key cache management functions from ath9k to ath	2010-09-16 15:19:45 -04:00
reg.h	ath9k_hw: move the cycle counter tracking to ath	2010-10-11 15:04:20 -04:00
regd_common.h
regd.c	drivers/net: Remove unnecessary returns from void function()s	2010-05-14 00:19:28 -07:00
regd.h	ath9k_hw: fix parsing of HT40 5 GHz CTLs	2010-08-31 14:52:23 -04:00