ARM: Merge next-s3c24xx-dev-rtp

Merge branch 'next-s3c24xx-dev-rtp' into for-rmk

Conflicts:

	arch/arm/mach-s3c2440/mach-anubis.c

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

diff --cc arch/arm/mach-s3c2440/mach-anubis.c
index c3705b99d15ca8ce4644022ce36213bdecf55a33,5f5dccf306a830405ef39466bd8aaabcac2ed776..62a4c3eba97f126e6dd40ec91b9560a96d4eaace
--- 1/arch/arm/mach-s3c2440/mach-anubis.c
--- 2/arch/arm/mach-s3c2440/mach-anubis.c
+++ b/arch/arm/mach-s3c2440/mach-anubis.c
@@@ -488,7 -474,8 +486,9 @@@ static void __init anubis_map_io(void
  static void __init anubis_init(void)
  {
        s3c_i2c0_set_platdata(NULL);
+       s3c_nand_set_platdata(&anubis_nand_info);
 +      simtec_audio_add(NULL, false, &anubis_audio);
+ 
        platform_add_devices(anubis_devices, ARRAY_SIZE(anubis_devices));
  
        i2c_register_board_info(0, anubis_i2c_devs,

diff --cc arch/arm/mach-s3c2440/mach-osiris.c
Simple merge

diff --cc arch/arm/mach-s3c2440/mach-rx3715.c
Simple merge