Merge branches 'sh/pci-express-integration', 'sh/rsk-updates', 'sh/platform-updates...

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/sh/boards/mach-highlander/setup.c
index dd297d8,20fe72c,20fe72c,920ea76,20fe72c..1639f89
--- 1/arch/sh/boards/mach-highlander/setup.c
--- 2/arch/sh/boards/mach-highlander/setup.c
--- 3/arch/sh/boards/mach-highlander/setup.c
--- 4/arch/sh/boards/mach-highlander/setup.c
--- 5/arch/sh/boards/mach-highlander/setup.c
+++ b/arch/sh/boards/mach-highlander/setup.c
@@@@@@ -17,9 -17,8 -17,8 -17,10 -17,8 +17,11 @@@@@@
     #include <linux/platform_device.h>
     #include <linux/ata_platform.h>
     #include <linux/types.h>
 ++++#include <linux/mtd/physmap.h>
     #include <linux/i2c.h>
     #include <linux/irq.h>
+++ +#include <linux/interrupt.h>
+++ +#include <linux/usb/r8a66597.h>
     #include <net/ax88796.h>
     #include <asm/machvec.h>
     #include <mach/highlander.h>