Merge branch 'master' into h8300

Conflicts:
	arch/h8300/Kconfig
	arch/h8300/Makefile
	arch/h8300/kernel/vmlinux.lds.S
	drivers/tty/serial/sh-sci.c
	sound/soc/codecs/wm8994.c

diff --cc arch/h8300/Kconfig
index d7e1333,336e76d..ab78325
--- 1/arch/h8300/Kconfig
--- 2/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@@ -7,10 -8,12 +7,17 @@@ config H830
        select VIRT_TO_BUS
        select ARCH_WANT_IPC_PARSE_VERSION
        select GENERIC_IRQ_SHOW
 +      select ARCH_WANT_FRAME_POINTER
        select GENERIC_CPU_DEVICES
        select MODULES_USE_ELF_RELA
++<<<<<<< HEAD
 +      select GENERIC_CLOCKEVENTS
++=======
+       select OLD_SIGSUSPEND3
+       select OLD_SIGACTION
+       select HAVE_UNDERSCORE_SYMBOL_PREFIX
+       select FRAME_POINTER
++>>>>>>> master
  
  config MMU
        bool

diff --cc arch/h8300/Makefile
index 90f97c2,bfd68aa..aaeae96
--- 1/arch/h8300/Makefile
--- 2/arch/h8300/Makefile
+++ b/arch/h8300/Makefile
@@@ -18,13 -35,19 +18,23 @@@ KBUILD_CFLAGS += -mint32 -fno-builti
  KBUILD_CFLAGS += -g
  KBUILD_CFLAGS += -D__linux__
  KBUILD_CFLAGS += -DUTS_SYSNAME=\"uClinux\"
 -KBUILD_AFLAGS += -DPLATFORM=$(PLATFORM) -DMODEL=$(MODEL) $(cflags-y)
 +KBUILD_AFLAGS += $(cflags-y)
  LDFLAGS += $(ldflags-y)
  
 -CROSS_COMPILE = h8300-elf-
 +CROSS_COMPILE := h8300-unknown-linux-
  LIBGCC := $(shell $(CROSS-COMPILE)$(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
  
++<<<<<<< HEAD
 +core-y        += arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/ arch/$(ARCH)/boards/
++=======
+ head-y := arch/$(ARCH)/platform/$(PLATFORM)/$(BOARD)/crt0_$(MODEL).o
+ 
+ core-y        += arch/$(ARCH)/kernel/ \
+          arch/$(ARCH)/mm/
+ ifdef PLATFORM
+ core-y        += arch/$(ARCH)/platform/$(PLATFORM)/ 
+ endif
++>>>>>>> master
  
  libs-y        += arch/$(ARCH)/lib/ $(LIBGCC)
  

diff --cc arch/h8300/kernel/vmlinux.lds.S
index ecc9619,03498ab..4a37ec9
--- 1/arch/h8300/kernel/vmlinux.lds.S
--- 2/arch/h8300/kernel/vmlinux.lds.S
+++ b/arch/h8300/kernel/vmlinux.lds.S
@@@ -34,20 -82,14 +34,24 @@@ SECTION
        }
        EXCEPTION_TABLE(16)
        NOTES
++<<<<<<< HEAD
 +      RO_DATA(4)
++=======
+       RODATA
++>>>>>>> master
  #if defined(CONFIG_ROMKERNEL)
 +      .init.text : {
 +              _sinittext = .;
 +              INIT_TEXT
 +              _einittext = .;
 +      }
        SECURITY_INIT
  #endif
 -      ROEND = .; 
 +      ROMEND = .;
  #if defined(CONFIG_ROMKERNEL)
        . = RAMTOP;
 -      .data : AT(ROEND)
 +      _ramstart = .;
 +      .data : AT(ROMEND)
  #else
        .data : 
  #endif