Merge branch 'master' into ysato-h8300

Conflicts:
	drivers/clocksource/Kconfig
	drivers/clocksource/Makefile

diff --cc drivers/clk/Makefile
Simple merge

diff --cc drivers/clocksource/Kconfig
index 4116409,51d7865..88aecb6
--- 1/drivers/clocksource/Kconfig
--- 2/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -229,10 -252,10 +252,16 @@@ config CLKSRC_MIPS_GI
        depends on MIPS_GIC
        select CLKSRC_OF
  
 -      select CLKSRC_OF if USE_OF
+ config CLKSRC_PXA
+       def_bool y if ARCH_PXA || ARCH_SA1100
+       help
+         This enables OST0 support available on PXA and SA-11x0
+         platforms.
++
 +config H8300_TMR16
 +        bool
 +
 +config H8300_TPU
 +        bool
 +
  endmenu

diff --cc drivers/clocksource/Makefile
index 18824ed,5b85f6a..8288c4e
--- 1/drivers/clocksource/Makefile
--- 2/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -48,6 -51,4 +51,7 @@@ obj-$(CONFIG_ARCH_KEYSTONE)           += timer-k
  obj-$(CONFIG_ARCH_INTEGRATOR_AP)      += timer-integrator-ap.o
  obj-$(CONFIG_CLKSRC_VERSATILE)                += versatile.o
  obj-$(CONFIG_CLKSRC_MIPS_GIC)         += mips-gic-timer.o
+ obj-$(CONFIG_ASM9260_TIMER)           += asm9260_timer.o
 +obj-$(CONFIG_H8300)                   += h8300_timer8.o
 +obj-$(CONFIG_H8300_TMR16)             += h8300_timer16.o
 +obj-$(CONFIG_H8300_TPU)                       += h8300_tpu.o

diff --cc drivers/tty/serial/Kconfig
Simple merge

diff --cc include/linux/clk-provider.h
Simple merge