Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/i2c/chips/isp1301_omap.c

diff --cc drivers/i2c/busses/Makefile
Simple merge

diff --cc drivers/i2c/busses/i2c-omap.c
Simple merge

diff --cc drivers/i2c/chips/isp1301_omap.c
index 09f96627bbc7fba00b357d6caf3eed129c6b07a3,b1b45dddb17e051286ec1429f209c528cd81cb98..152554311faeaf154156e51d87a504f40cd38476
--- 1/drivers/i2c/chips/isp1301_omap.c
--- 2/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@@ -1079,9 -1075,9 +1079,9 @@@ static void isp_update_otg(struct isp13
        /* update the OTG controller state to match the isp1301; may
         * trigger OPRT_CHG irqs for changes going to the isp1301.
         */
 -      update_otg1(isp, isp_stat);
 +      update_otg1(isp, stat); // pass the actual interrupt latch status
        update_otg2(isp, isp_bstat);
-       check_state(isp, __FUNCTION__);
+       check_state(isp, __func__);
  #endif
  
        dump_regs(isp, "isp1301->otg");
@@@ -1362,11 -1361,11 +1362,11 @@@ isp1301_set_peripheral(struct otg_trans
                isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, MC1_DAT_SE0);
  
        isp1301_set_bits(isp, ISP1301_INTERRUPT_RISING,
 -              INTR_SESS_VLD);
 +              INTR_SESS_VLD | INTR_VBUS_VLD);
        isp1301_set_bits(isp, ISP1301_INTERRUPT_FALLING,
 -              INTR_VBUS_VLD);
 -      dev_info(&isp->client.dev, "B-Peripheral sessions ok\n");
 +              INTR_VBUS_VLD | INTR_SESS_VLD);
 +      dev_info(&isp->client->dev, "B-Peripheral sessions ok\n");
-       dump_regs(isp, __FUNCTION__);
+       dump_regs(isp, __func__);
  
        /* If this has a Mini-AB connector, this mode is highly
         * nonstandard ... but can be handy for testing, so long
@@@ -1579,7 -1600,8 +1579,7 @@@ fail2
        update_otg1(isp, isp1301_get_u8(isp, ISP1301_INTERRUPT_SOURCE));
        update_otg2(isp, isp1301_get_u8(isp, ISP1301_OTG_STATUS));
  #endif
-       dump_regs(isp, __FUNCTION__);
 -
+       dump_regs(isp, __func__);
  
  #ifdef        VERBOSE
        mod_timer(&isp->timer, jiffies + TIMER_JIFFIES);

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/misc/Makefile
Simple merge