Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

diff --cc Makefile
Simple merge

diff --cc drivers/rtc/Kconfig
index ee75f3ff5f3676ef92d051fcf44d222a8979f547,02a4c8cf2b2d8c5d240e2349d190b0ef620ad9f7..50189de2dbc5a175b7f673763e66d02f34f36a54
--- 1/drivers/rtc/Kconfig
--- 2/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@@ -250,18 -250,9 +250,19 @@@ config RTC_DRV_TWL9233
          platforms.  The support is integrated with the rest of
          the Menelaus driver; it's not separate module.
  
 +config RTC_DRV_TWL4030
 +      tristate "OMAP TWL4030 Real Time Clock"
 +      depends on RTC_CLASS && TWL4030_CORE
 +      help
 +        If you say yes here you get support for internal Real-Time 
 +        Clock of TWL4030 chip.
 +
 +        This driver can also be built as a module. If so, the module
 +        will be called rtc-twl4030.
 +
  config RTC_DRV_S35390A
        tristate "Seiko Instruments S-35390A"
+       select BITREVERSE
        help
          If you say yes here you will get support for the Seiko
          Instruments S-35390A.

diff --cc drivers/usb/gadget/omap_udc.c
Simple merge

diff --cc drivers/usb/host/ohci-omap.c
Simple merge

diff --cc drivers/watchdog/omap_wdt.c
Simple merge