Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)
  sh: asm/gpio.h needs linux/kernel.h for might_sleep()/WARN_ON().
  sh: mach-highlander: Handle SCIF pinmuxing on R7785RP.
  sh: sh7785 pinmux support
  sh: update defconfigs.
  sh: Kill off unused p1fc divisors from SH7763 clk fwk.
  sh: improve pinmux support for single direction pins
  sh: use 10MHz VIO_CLK for ov772x on Migo-R
  sh: Update gpio_set_value() pin value handling
  sh: update ov772x byte order on Migo-R
  rtc: Add R2025S/D comment to rs5c372 Kconfig entry.
  sh: Export cache flush routines needed by sh_eth on SH7619.
  sh: Wire up oops reporting in the die notifier chain.
  sh: ap325rxa: Kill off unused port definitions.
  sh: Hook up PB0->PB7 input-only pins in SH7203 PFC.
  sh: ap325rxa: Move off of hardcoded pinmux for flctl initialization.
  sh: add support FLCTL for ap325rxa board
  sh: gpio: Stub in dummy GPIO<->IRQ mapping routines.
  sh: rsk7203: leds-gpio support for RSK+ LEDs.
  sh: gpio: Include asm-generic/gpio.h for non-gpiolib stubs.
  sh: fix soc-camera compile breakage on Migo-R.
  ...

diff --combined drivers/rtc/Kconfig
index 847481dc8d722093175eb90bf0957a0479f0a5e6,671a7d634d8bea5850bd231831d85c5a66f03932..8abbb2020af9c0d6b238d16cf81c4277de31dc3d
--- 1/drivers/rtc/Kconfig
--- 2/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@@ -171,10 -171,10 +171,10 @@@ config RTC_DRV_MAX690
          will be called rtc-max6900.
  
  config RTC_DRV_RS5C372
-       tristate "Ricoh RS5C372A/B, RV5C386, RV5C387A"
+       tristate "Ricoh R2025S/D, RS5C372A/B, RV5C386, RV5C387A"
        help
          If you say yes here you get support for the
-         Ricoh RS5C372A, RS5C372B, RV5C386, and RV5C387A RTC chips.
+         Ricoh R2025S/D, RS5C372A, RS5C372B, RV5C386, and RV5C387A RTC chips.
  
          This driver can also be built as a module. If so, the module
          will be called rtc-rs5c372.
@@@ -246,16 -246,6 +246,16 @@@ 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 "TI TWL4030/TWL5030/TPS659x0"
 +      depends on RTC_CLASS && TWL4030_CORE
 +      help
 +        If you say yes here you get support for the RTC on the
 +        TWL4030 family chips, used mostly with OMAP3 platforms.
 +
 +        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