Merge 'Linux v3.0' into Litmus

Some notes:
* Litmus^RT scheduling class is the topmost scheduling class
  (above stop_sched_class).
* scheduler_ipi() function (e.g., in smp_reschedule_interrupt())
  may increase IPI latencies.
* Added path into schedule() to quickly re-evaluate scheduling
  decision without becoming preemptive again. This used to be
  a standard path before the removal of BKL.

Conflicts:
	Makefile
	arch/arm/kernel/calls.S
	arch/arm/kernel/smp.c
	arch/x86/include/asm/unistd_32.h
	arch/x86/kernel/smp.c
	arch/x86/kernel/syscall_table_32.S
	include/linux/hrtimer.h
	kernel/printk.c
	kernel/sched.c
	kernel/sched_fair.c

1 files changed, 31 insertions, 0 deletions

diff --git a/include/linux/mfd/tps6586x.h b/include/linux/mfd/tps6586x.h
index 772b3ae640af..b6bab1b04e25 100644
--- a/include/linux/mfd/tps6586x.h
+++ b/include/linux/mfd/tps6586x.h
@@ -18,6 +18,36 @@ enum {
         TPS6586X_ID_LDO_RTC,
 };
 
+enum {
+        TPS6586X_INT_PLDO_0,
+        TPS6586X_INT_PLDO_1,
+        TPS6586X_INT_PLDO_2,
+        TPS6586X_INT_PLDO_3,
+        TPS6586X_INT_PLDO_4,
+        TPS6586X_INT_PLDO_5,
+        TPS6586X_INT_PLDO_6,
+        TPS6586X_INT_PLDO_7,
+        TPS6586X_INT_COMP_DET,
+        TPS6586X_INT_ADC,
+        TPS6586X_INT_PLDO_8,
+        TPS6586X_INT_PLDO_9,
+        TPS6586X_INT_PSM_0,
+        TPS6586X_INT_PSM_1,
+        TPS6586X_INT_PSM_2,
+        TPS6586X_INT_PSM_3,
+        TPS6586X_INT_RTC_ALM1,
+        TPS6586X_INT_ACUSB_OVP,
+        TPS6586X_INT_USB_DET,
+        TPS6586X_INT_AC_DET,
+        TPS6586X_INT_BAT_DET,
+        TPS6586X_INT_CHG_STAT,
+        TPS6586X_INT_CHG_TEMP,
+        TPS6586X_INT_PP,
+        TPS6586X_INT_RESUME,
+        TPS6586X_INT_LOW_SYS,
+        TPS6586X_INT_RTC_ALM2,
+};
+
 struct tps6586x_subdev_info {
         int             id;
         const char      *name;
@@ -29,6 +59,7 @@ struct tps6586x_platform_data {
         struct tps6586x_subdev_info *subdevs;
 
         int gpio_base;
+        int irq_base;
 };
 
 /*