Merge branch 'sh/stable-updates'

diff --cc arch/sh/boards/mach-se/7724/setup.c
index 242dc843f5741bd64597b62029d16f109b2e86c7,858ecb25d4699a5e42a4a2f05ed1e9e710170cb6..c7dbbece44b0457a16f66fabb7aaf28cc1a54aa4
--- 1/arch/sh/boards/mach-se/7724/setup.c
--- 2/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@@ -522,9 -531,9 +522,9 @@@ static int __init sh_eth_is_eeprom_read
        int t = 10000;
  
        while (t--) {
 -              if (!ctrl_inw(EEPROM_STAT))
 +              if (!__raw_readw(EEPROM_STAT))
                        return 1;
-               cpu_relax();
+               udelay(1);
        }
  
        printk(KERN_ERR "ms7724se can not access to eeprom\n");

diff --cc arch/sh/kernel/process_64.c
Simple merge