Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
	drivers/iommu/Makefile

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/arm/common/gic.c
index 666b278e56d7c6bf4610e05f0afd25de06646944,6fba8bd5689e2b1e36932b79c36d4a85fedc2649..bdbb3f74f0fe4ad57cf8b97cddf80bc76ad3c649
--- 1/arch/arm/common/gic.c
--- 2/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@@ -180,12 -180,12 +180,12 @@@ static int gic_set_affinity(struct irq_
                return -EINVAL;
  
        mask = 0xff << shift;
 -      bit = 1 << (cpu + shift);
 +      bit = 1 << (cpu_logical_map(cpu) + shift);
  
-       spin_lock(&irq_controller_lock);
+       raw_spin_lock(&irq_controller_lock);
        val = readl_relaxed(reg) & ~mask;
        writel_relaxed(val | bit, reg);
-       spin_unlock(&irq_controller_lock);
+       raw_spin_unlock(&irq_controller_lock);
  
        return IRQ_SET_MASK_OK;
  }

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc arch/arm/kernel/traps.c
index 74969248c375ee3d5c60f0a98f2d5018252fa50f,81cc05a0274cb3f32a27ddb10ba42eac77772cbc..c32ba00e8437464f0069212c5ffa06472da741ed
--- 1/arch/arm/kernel/traps.c
--- 2/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@@ -268,11 -267,9 +268,11 @@@ void die(const char *str, struct pt_reg
  
        oops_enter();
  
-       spin_lock_irq(&die_lock);
+       raw_spin_lock_irq(&die_lock);
        console_verbose();
        bust_spinlocks(1);
 +      if (!user_mode(regs))
 +              report_bug(regs->ARM_pc, regs);
        ret = __die(str, err, thread, regs);
  
        if (regs && kexec_should_crash(thread->task))
@@@ -304,26 -301,8 +304,26 @@@ void arm_notify_die(const char *str, st
        }
  }
  
 +#ifdef CONFIG_GENERIC_BUG
 +
 +int is_valid_bugaddr(unsigned long pc)
 +{
 +#ifdef CONFIG_THUMB2_KERNEL
 +      unsigned short bkpt;
 +#else
 +      unsigned long bkpt;
 +#endif
 +
 +      if (probe_kernel_address((unsigned *)pc, bkpt))
 +              return 0;
 +
 +      return bkpt == BUG_INSTR_VALUE;
 +}
 +
 +#endif
 +
  static LIST_HEAD(undef_hook);
- static DEFINE_SPINLOCK(undef_lock);
+ static DEFINE_RAW_SPINLOCK(undef_lock);
  
  void register_undef_hook(struct undef_hook *hook)
  {

diff --cc arch/arm/mach-footbridge/netwinder-hw.c
Simple merge

diff --cc arch/arm/mach-integrator/core.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/common-pci.c
Simple merge

diff --cc arch/arm/mm/cache-l2x0.c
Simple merge

diff --cc arch/arm/mm/context.c
Simple merge

diff --cc arch/ia64/configs/generic_defconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/cpufeature.h
Simple merge

diff --cc drivers/acpi/processor_idle.c
Simple merge

diff --cc drivers/cpufreq/cpufreq_ondemand.c
Simple merge

diff --cc drivers/iommu/Kconfig
Simple merge

diff --cc drivers/iommu/Makefile
index f798cdd3699e2081fbed2fec81eec9f409d155b2,6394994a2b9dafff89522e1bb22ad021c09d30fb..2f4448794bc793133d5f1e8a3145be4c1cc685b3
--- 1/drivers/iommu/Makefile
--- 2/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@@ -1,8 -1,6 +1,9 @@@
  obj-$(CONFIG_IOMMU_API) += iommu.o
  obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o
  obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o
- obj-$(CONFIG_DMAR) += dmar.o iova.o intel-iommu.o
- obj-$(CONFIG_INTR_REMAP) += dmar.o intr_remapping.o
+ obj-$(CONFIG_DMAR_TABLE) += dmar.o
+ obj-$(CONFIG_INTEL_IOMMU) += iova.o intel-iommu.o
+ obj-$(CONFIG_IRQ_REMAP) += intr_remapping.o
 +obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o
 +obj-$(CONFIG_OMAP_IOVMM) += omap-iovmm.o
 +obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc kernel/sched.c
Simple merge