David S. Miller 6a7ebdf2fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/bluetooth/l2cap_core.c		2011-07-14 07:56:40 -07:00
..
Kconfig	…
Makefile	…
b43_pci_bridge.c	…
driver_chipcommon.c	…
driver_chipcommon_pmu.c	drivers/ssb/driver_chipcommon_pmu.c: uninitilized warning	2011-06-17 14:22:17 -04:00
driver_extif.c	…
driver_gige.c	ssb: add __devinit to some functions	2011-06-22 16:09:58 -04:00
driver_mipscore.c	…
driver_pcicore.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-07-14 07:56:40 -07:00
embedded.c	…
main.c	ssb: fix ssb clock rate according to broadcom source	2011-06-27 15:09:39 -04:00
pci.c	ssb: use pci_dev->subsystem_{vendor,device}	2011-07-05 15:32:54 -04:00
pcihost_wrapper.c	ssb: add __devinit to some functions	2011-06-22 16:09:58 -04:00
pcmcia.c	…
scan.c	ssb: use pci_dev->revision	2011-06-27 15:09:40 -04:00
sdio.c	…
sprom.c	…
ssb_private.h	…