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
..
ani.c	ath5k: use the common cycle counter / listen time implementation	2010-10-11 15:04:20 -04:00
ani.h	ath5k: use the common cycle counter / listen time implementation	2010-10-11 15:04:20 -04:00
ath5k.h	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
attach.c	ath5k: Fix double free on hw attach error path	2010-10-27 15:54:54 -04:00
base.c	ath5k: Put the right tsf value in mesh beacons	2010-12-08 15:23:46 -05:00
base.h	ath5k: Print rx/tx bytes in debugfs	2010-10-05 13:35:25 -04:00
caps.c
debug.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
debug.h	ath5k: Move debugfs under ieee80211/[wiphy-name]	2010-10-13 15:45:21 -04:00
desc.c
desc.h
dma.c	ath5k: Fix bitmasks and typos for PCU Diagnostic register	2010-09-28 15:47:57 -04:00
eeprom.c
eeprom.h
gpio.c
initvals.c
Kconfig
led.c
Makefile
pcu.c	ath5k: store the clock rate in common data on channel changes	2010-10-11 15:04:20 -04:00
phy.c	ath5k: store the clock rate in common data on channel changes	2010-10-11 15:04:20 -04:00
qcu.c
reg.h	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
reset.c	ath5k: Allow ath5k to support virtual STA and AP interfaces.	2010-10-05 13:35:23 -04:00
rfbuffer.h
rfgain.h
rfkill.c
sysfs.c