David S. Miller 7c3ceb4a40 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl-3945.c net/mac80211/mlme.c		2008-07-08 16:30:17 -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
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
Kconfig	ssb, b43, b43legacy, b44: Rewrite SSB DMA API	2008-06-27 09:09:15 -04:00
main.c	ssb, b43, b43legacy, b44: Rewrite SSB DMA API	2008-06-27 09:09:15 -04:00
Makefile
pci.c	ssb: Allow reading of 440-byte SPROM that is not rev 4	2008-05-07 15:02:12 -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_private.h	ssb: Turn suspend/resume upside down	2008-04-08 15:05:57 -04:00