]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/drivers' into for-next
authorOlof Johansson <olof@lixom.net>
Wed, 12 Jun 2013 19:32:19 +0000 (12:32 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 12 Jun 2013 23:10:09 +0000 (16:10 -0700)
commit59dd4922a4e9568815abd10f4a17779fdb6239df
tree527fd7b54c6943fa47eb97c695b4b16adde89e87
parentfce1ead5f2254a6e365c062c0406151b14e5f45c
parent7d428ce284fce4aacb215ca15d0274e7261864a3
Merge branch 'next/drivers' into for-next

* next/drivers:
  clocksource: dw_apb_timer_of: use clocksource_of_init
  clocksource: dw_apb_timer_of: select DW_APB_TIMER
  clocksource: dw_apb_timer_of: add clock-handling
  clocksource: dw_apb_timer_of: enable the use the clocksource as sched clock

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/arm-soc-for-next-contents.txt
arch/arm/mach-socfpga/Kconfig