David S. Miller 255333c1db Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	net/mac80211/rc80211_pid_algo.c

2008-03-05 12:26:41 -08:00

..

b43_pci_bridge.c

drivers/ssb/: Spelling fixes

2008-02-03 17:30:25 +02:00

driver_chipcommon.c

ssb: Add CHIPCO IRQ access functions

2008-02-29 15:41:43 -05:00

driver_extif.c

ssb: Make the GPIO API reentrancy safe

2008-02-20 20:11:49 -05:00

driver_mipscore.c

[PATCH] ssb: Fix a null pointer check in mipscore init

2007-10-16 21:04:11 -04:00

driver_pcicore.c

ssb: Add pcibios_enable_device() return value check

2008-03-04 18:36:35 -05:00

embedded.c

ssb: Make the GPIO API reentrancy safe

2008-02-20 20:11:49 -05:00

Kconfig

Use a separate config option for the b43 pci to ssb bridge.

2008-02-28 09:13:10 -05:00

main.c

ssb: Add support for 8bit register access

2008-02-29 15:37:26 -05:00

Makefile

Use a separate config option for the b43 pci to ssb bridge.

2008-02-28 09:13:10 -05:00

pci.c

ssb: Add support for 8bit register access

2008-02-29 15:37:26 -05:00

pcihost_wrapper.c

…

pcmcia.c

ssb: Add support for 8bit register access

2008-02-29 15:37:26 -05:00

scan.c

ssb: Fix probing of PCI cores if PCI and PCIE core is available

2008-01-08 23:30:10 -08:00

ssb_private.h

Use a separate config option for the b43 pci to ssb bridge.

2008-02-28 09:13:10 -05:00