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

Conflicts:
	arch/sh/kernel/cpu/sh2a/Makefile

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