Merge remote-tracking branch 'sh/sh-latest'

Conflicts:
	arch/sh/kernel/cpu/sh2a/Makefile
	include/linux/serial_sci.h

diff --cc arch/sh/kernel/cpu/sh2a/Makefile
index 990195d9845607bfcca4a8b3cfcd05c41df582bc,130984caa6014c8fa09fd2a6164299d4252e8b5c..92f0da4c86a7533e18269e6f5d439130e1a71815
--- 1/arch/sh/kernel/cpu/sh2a/Makefile
--- 2/arch/sh/kernel/cpu/sh2a/Makefile
+++ b/arch/sh/kernel/cpu/sh2a/Makefile
@@@ -21,4 -21,5 +21,5 @@@ pinmux-$(CONFIG_CPU_SUBTYPE_SH7203)   := 
  pinmux-$(CONFIG_CPU_SUBTYPE_SH7264)   := pinmux-sh7264.o
  pinmux-$(CONFIG_CPU_SUBTYPE_SH7269)   := pinmux-sh7269.o
  
 -obj-$(CONFIG_GENERIC_GPIO)            += $(pinmux-y)
 +obj-$(CONFIG_GPIOLIB)                 += $(pinmux-y)
+ obj-$(CONFIG_HAVE_HW_BREAKPOINT)      += ubc.o

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

diff --cc include/linux/serial_sci.h
index d34049712a4d7cee24958816840ca1c843e0541f,857eec4336e39ea564516aba7bb66b0f459a63db..dca3c08d414112cfb56dbe011db8263c6b81343f
--- 1/include/linux/serial_sci.h
--- 2/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@@ -16,7 -18,8 +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)