Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/rtc/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc drivers/rtc/Kconfig
index 36cfca31769c22a46570aa913479ca3b75482d7a,82f5ad9c3af479a86e711819b8cea6ddfc42f947..0cdeb11a9cb5e5eea0d14bf4ad63ba5fe310750b
--- 1/drivers/rtc/Kconfig
--- 2/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@@ -250,16 -250,15 +250,25 @@@ 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"
+       help
+         If you say yes here you will get support for the Seiko
+         Instruments S-35390A.
+ 
+         This driver can also be built as a module. If so the module
+         will be called rtc-s35390a.
+ 
  endif # I2C
  
  comment "SPI RTC drivers"

diff --cc drivers/rtc/Makefile
Simple merge

diff --cc include/linux/connector.h
Simple merge