Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: parport_mfc3 - Not makes it a bool before the comparison.
  m68k: don't export static inline functions
  fbdev: atafb - add palette register check
  m68k: Remove the BKL from sys_execve
  m68k: Cleanup linker scripts using new linker script macros.
  m68k: Make thread_info.h usable from assembly.
  m68knommu: define arch_has_single_step() and friends
  m68k: ptrace fixes
  m68k: use generic code for ptrace requests
  rtc: Add an RTC driver for the Ricoh RP5C01
  rtc: Add an RTC driver for the Oki MSM6242

diff --combined drivers/rtc/Kconfig
index e11e1cda4ba2308fd7680eaddb1b1f60101dc3ef,4fcd36dd7eb6c4ef5ef089cda230a8c7b879072c..f2e1004d12c7807f56b129e221a36c23cdc1c3bf
--- 1/drivers/rtc/Kconfig
--- 2/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@@ -509,6 -509,15 +509,15 @@@ config RTC_DRV_M48T5
          This driver can also be built as a module, if so, the module
          will be called "rtc-m48t59".
  
+ config RTC_DRV_MSM6242
+       tristate "Oki MSM6242"
+       help
+         If you say yes here you get support for the Oki MSM6242
+         timekeeping chip. It is used in some Amiga models (e.g. A2000).
+ 
+         This driver can also be built as a module. If so, the module
+         will be called rtc-msm6242.
+ 
  config RTC_MXC
        tristate "Freescale MXC Real Time Clock"
        depends on ARCH_MXC
@@@ -529,6 -538,16 +538,16 @@@ config RTC_DRV_BQ480
          This driver can also be built as a module. If so, the module
          will be called rtc-bq4802.
  
+ config RTC_DRV_RP5C01
+       tristate "Ricoh RP5C01"
+       help
+         If you say yes here you get support for the Ricoh RP5C01
+         timekeeping chip. It is used in some Amiga models (e.g. A3000
+         and A4000).
+ 
+         This driver can also be built as a module. If so, the module
+         will be called rtc-rp5c01.
+ 
  config RTC_DRV_V3020
        tristate "EM Microelectronic V3020"
        help
@@@ -780,7 -799,7 +799,7 @@@ config RTC_DRV_TX493
  
  config RTC_DRV_MV
        tristate "Marvell SoC RTC"
 -      depends on ARCH_KIRKWOOD
 +      depends on ARCH_KIRKWOOD || ARCH_DOVE
        help
          If you say yes here you will get support for the in-chip RTC
          that can be found in some of Marvell's SoC devices, such as