Merge remote-tracking branch 'renesas/next'

Conflicts:
	arch/arm/mach-shmobile/board-bockw.c
	arch/arm/mach-shmobile/clock-r8a7778.c
	arch/arm/mach-shmobile/include/mach/r8a7778.h
	include/linux/serial_sci.h
	include/uapi/linux/serial_core.h

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge

diff --cc drivers/tty/serial/sh-sci.c
Simple merge

diff --cc include/linux/serial_sci.h
index 857eec4336e39ea564516aba7bb66b0f459a63db,d34049712a4d7cee24958816840ca1c843e0541f..dca3c08d414112cfb56dbe011db8263c6b81343f
--- 1/include/linux/serial_sci.h
--- 2/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@@ -18,8 -16,7 +18,9 @@@ enum 
        SCBRR_ALGO_3,           /* (((clk * 2) + 16 * bps) / (16 * bps) - 1) */
        SCBRR_ALGO_4,           /* (((clk * 2) + 16 * bps) / (32 * bps) - 1) */
        SCBRR_ALGO_5,           /* (((clk * 1000 / 32) / bps) - 1) */
+       SCBRR_ALGO_6,           /* HSCIF variable sample rate algorithm */
 +
 +      SCBRR_NR_ALGOS,
  };
  
  #define SCSCR_TIE     (1 << 7)

diff --cc include/uapi/linux/serial_core.h
index c8eaeb5465ef76e4ec8992f45e6523a72ebc258c,26eee07eeb246ce06eac5c37ced79c3e8765862b..9119cc0977bf42a36f2ae8aa51123c99b0b5f9d7
--- 1/include/uapi/linux/serial_core.h
--- 2/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@@ -226,7 -226,7 +226,10 @@@
  /* Rocketport EXPRESS/INFINITY */
  #define PORT_RP2      102
  
 -#define PORT_HSCIF    103
 +/* Freescale lpuart */
 +#define PORT_LPUART   103
 +
+ /* SH-SCI */
++#define PORT_HSCIF    104
+ 
  #endif /* _UAPILINUX_SERIAL_CORE_H */