John W. Linville 9ebea3829f Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ... Conflicts: drivers/net/wireless/ath/ath9k/main.c drivers/net/wireless/iwlwifi/dvm/tx.c		2013-01-28 13:54:03 -05:00
..
b43_pci_bridge.c	ssb: add PCI ID 0x4350	2012-10-29 15:30:36 -04:00
driver_chipcommon.c	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-12-14 14:27:45 -08:00
driver_chipcommon_pmu.c	ssb: get alp clock from devices with PMU	2012-12-06 14:58:57 -05:00
driver_chipcommon_sflash.c	ssb: add database of serial flash memories	2013-01-11 14:49:58 -05:00
driver_extif.c	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-12-14 14:27:45 -08:00
driver_gige.c
driver_gpio.c	ssb: add GPIO driver	2012-11-21 21:55:52 +01:00
driver_mipscore.c	ssb: add place for serial flash driver	2013-01-09 14:37:09 -05:00
driver_pcicore.c
embedded.c	ssb: register watchdog driver	2012-12-06 14:58:58 -05:00
Kconfig	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-01-28 13:54:03 -05:00
main.c	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-12-14 14:27:45 -08:00
Makefile	ssb: add place for serial flash driver	2013-01-09 14:37:09 -05:00
pci.c	bcma/ssb: parse new attributes from sprom	2012-05-16 12:45:22 -04:00
pcihost_wrapper.c
pcmcia.c
scan.c	ssb: recognize ARM Cortex M3	2012-06-06 15:20:22 -04:00
sdio.c
sprom.c
ssb_private.h	ssb: add place for serial flash driver	2013-01-09 14:37:09 -05:00