Merge branch 'linus' into percpu-cpumask-x86-for-linus-2

Conflicts:
	arch/sparc/kernel/time_64.c
	drivers/gpu/drm/drm_proc.c

Manual merge to resolve build warning due to phys_addr_t type change
on x86:

	drivers/gpu/drm/drm_info.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 9 insertions, 8 deletions

diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
index b1b947edcf01..540a2948596c 100644
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -53,11 +53,11 @@ config SSB_B43_PCI_BRIDGE
 
 config SSB_PCMCIAHOST_POSSIBLE
         bool
-        depends on SSB && (PCMCIA = y || PCMCIA = SSB) && EXPERIMENTAL
+        depends on SSB && (PCMCIA = y || PCMCIA = SSB)
         default y
 
 config SSB_PCMCIAHOST
-        bool "Support for SSB on PCMCIA-bus host (EXPERIMENTAL)"
+        bool "Support for SSB on PCMCIA-bus host"
         depends on SSB_PCMCIAHOST_POSSIBLE
         select SSB_SPROM
         help
@@ -107,14 +107,14 @@ config SSB_DRIVER_PCICORE
           If unsure, say Y
 
 config SSB_PCICORE_HOSTMODE
-        bool "Hostmode support for SSB PCI core (EXPERIMENTAL)"
-        depends on SSB_DRIVER_PCICORE && SSB_DRIVER_MIPS && EXPERIMENTAL
+        bool "Hostmode support for SSB PCI core"
+        depends on SSB_DRIVER_PCICORE && SSB_DRIVER_MIPS
         help
           PCIcore hostmode operation (external PCI bus).
 
 config SSB_DRIVER_MIPS
-        bool "SSB Broadcom MIPS core driver (EXPERIMENTAL)"
-        depends on SSB && MIPS && EXPERIMENTAL
+        bool "SSB Broadcom MIPS core driver"
+        depends on SSB && MIPS
         select SSB_SERIAL
         help
           Driver for the Sonics Silicon Backplane attached
@@ -129,8 +129,8 @@ config SSB_EMBEDDED
         default y
 
 config SSB_DRIVER_EXTIF
-        bool "SSB Broadcom EXTIF core driver (EXPERIMENTAL)"
-        depends on SSB_DRIVER_MIPS && EXPERIMENTAL
+        bool "SSB Broadcom EXTIF core driver"
+        depends on SSB_DRIVER_MIPS
         help
           Driver for the Sonics Silicon Backplane attached
           Broadcom EXTIF core.
diff --git a/drivers/ssb/b43_pci_bridge.c b/drivers/ssb/b43_pci_bridge.c
index 27a677584a4c..ef9c6a04ad8f 100644
--- a/drivers/ssb/b43_pci_bridge.c
+++ b/drivers/ssb/b43_pci_bridge.c
@@ -18,6 +18,7 @@
 
 static const struct pci_device_id b43_pci_bridge_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4301) },
+        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4306) },
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4307) },
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4311) },
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4312) },