David S. Miller b262e60309 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/ath9k/core.c drivers/net/wireless/ath9k/main.c net/core/dev.c		2008-10-01 06:12:56 -07:00
..
b43_pci_bridge.c
driver_chipcommon.c	ssb: Turn suspend/resume upside down	2008-04-08 15:05:57 -04:00
driver_extif.c
driver_gige.c	ssb: Add Gigabit Ethernet driver	2008-03-06 17:09:43 -05:00
driver_mipscore.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-14 02:30:23 -07:00
driver_pcicore.c	ssb-pcicore: Fix IRQ-vector init on embedded devices	2008-07-07 15:31:40 -04:00
embedded.c	ssb: Add Gigabit Ethernet driver	2008-03-06 17:09:43 -05:00
Kconfig	ssb, b43, b43legacy, b44: Rewrite SSB DMA API	2008-06-27 09:09:15 -04:00
main.c	[SSB] Initialise dma_mask for SSB_BUSTYPE_SSB devices	2008-09-27 15:45:37 +01:00
Makefile	ssb: Add SPROM/invariants support for PCMCIA devices	2008-03-13 19:32:32 -04:00
pci.c	ssb: Clean up extraction of MAC addresses from SPROM	2008-08-29 16:24:07 -04:00
pcihost_wrapper.c	ssb: Turn suspend/resume upside down	2008-04-08 15:05:57 -04:00
pcmcia.c	ssb: Add support for block-I/O	2008-04-08 16:44:40 -04:00
scan.c
sprom.c	ssb: Add SPROM/invariants support for PCMCIA devices	2008-03-13 19:32:32 -04:00
ssb_private.h	ssb: Turn suspend/resume upside down	2008-04-08 15:05:57 -04:00