Merge branch for-rmk-devel of git://aeryn.fluff.org.uk/bjdooks/linux into devel

diff --cc arch/arm/mach-ep93xx/core.c
Simple merge

diff --cc arch/arm/mach-s3c2410/mach-bast.c
Simple merge

diff --cc arch/arm/mach-s3c6400/include/mach/map.h
index 8199972ed5bd4046cefb0b4f7a2d4ee9d5c1818e,7a1e5a2455b31bfa1f9a0acee10b35398daad7a2..5057d9948d3588ceb784b179bbfad3ed3cdae6d9
--- 1/arch/arm/mach-s3c6400/include/mach/map.h
--- 2/arch/arm/mach-s3c6400/include/mach/map.h
+++ b/arch/arm/mach-s3c6400/include/mach/map.h
@@@ -39,9 -39,9 +39,11 @@@
  #define S3C_VA_UART3          S3C_VA_UARTx(3)
  
  #define S3C64XX_PA_FB         (0x77100000)
+ #define S3C64XX_PA_USB_HSOTG  (0x7C000000)
+ #define S3C64XX_PA_WATCHDOG   (0x7E004000)
  #define S3C64XX_PA_SYSCON     (0x7E00F000)
 +#define S3C64XX_PA_IIS0               (0x7F002000)
 +#define S3C64XX_PA_IIS1               (0x7F003000)
  #define S3C64XX_PA_TIMER      (0x7F006000)
  #define S3C64XX_PA_IIC0               (0x7F004000)
  #define S3C64XX_PA_IIC1               (0x7F00F000)

diff --cc arch/arm/mach-versatile/core.c
Simple merge

diff --cc arch/arm/plat-s3c24xx/dma.c
Simple merge

diff --cc arch/arm/plat-s3c64xx/gpiolib.c
Simple merge