Merge branch 'for-linus' of git://www.jni.nu/cris

* 'for-linus' of git://www.jni.nu/cris:
  Correct auto-restart of syscalls via restartblock
  CRISv10: Fix return before mutex_unlock in pcf8563
  Drop the CRISv32 version of pcf8563

diff --combined arch/cris/Kconfig
index 04a7fc5,7677416..617925d
--- 1/arch/cris/Kconfig
--- 2/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@@ -56,7 -56,6 +56,7 @@@ config CRI
        select HAVE_IDE
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_HARDIRQS_NO_DEPRECATED
 +      select GENERIC_IRQ_SHOW
  
  config HZ
        int
@@@ -276,6 -275,7 +276,6 @@@ config ETRAX_AXISFLASHMA
        select MTD_CHAR
        select MTD_BLOCK
        select MTD_PARTITIONS
 -      select MTD_CONCAT
        select MTD_COMPLEX_MAPPINGS
        help
          This option enables MTD mapping of flash devices.  Needed to use
@@@ -296,8 -296,7 +296,7 @@@ config ETRAX_RT
  choice
        prompt "RTC chip"
        depends on ETRAX_RTC
-       default ETRAX_PCF8563 if ETRAX_ARCH_V32
-       default ETRAX_DS1302 if ETRAX_ARCH_V10
+       default ETRAX_DS1302
  
  config ETRAX_DS1302
        depends on ETRAX_ARCH_V10