Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

Conflicts:
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/rtl818x/rtl8187/leds.c

diff --cc arch/arm/kernel/smp.c
index ff956e7d95017fb9ef537cb4f40726636b01c24c,4469924d683201391ab564b7d119217287310986..25f2a7666823c53da672fa4911ef05fa8252d2c0
--- 1/arch/arm/kernel/smp.c
--- 2/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@@ -636,13 -590,11 +642,15 @@@ asmlinkage void __exception_irq_entry d
                break;
  
        case IPI_CPU_STOP:
+               irq_enter();
                ipi_cpu_stop(cpu);
+               irq_exit();
                break;
  
 +      case IPI_CPU_BACKTRACE:
 +              ipi_cpu_backtrace(cpu, regs);
 +              break;
 +
        default:
                printk(KERN_CRIT "CPU%u: Unknown IPI message 0x%x\n",
                       cpu, ipinr);

diff --cc drivers/usb/serial/option.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/wireless/reg.c
Simple merge