]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/soc' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 17 Sep 2012 03:21:01 +0000 (20:21 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 17 Sep 2012 03:22:11 +0000 (20:22 -0700)
commitf15fb01c5593fa1b58cc7a8a9c59913e2625bf2e
tree91b5d86f03ece1e4874aad6c845b1b931a2a4f0a
parentac1476952c01e3373ff99937ed4b9eac3c8abb4a
parentf4936639bc4a75218b5598ff69c52b9a8dd7f23d
Merge branch 'next/soc' into for-next

* next/soc:
  ARM: AM33XX: clock: Add dcan clock aliases for device-tree
  ARM: OMAP2+: dpll: Add missing soc_is_am33xx() check for common functions
  ARM: OMAP3+: hwmod: Add AM33XX HWMOD data
  ARM: OMAP2+: hwmod: Hook-up am33xx support in omap_hwmod framework
arch/arm/arm-soc-for-next-contents.txt
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/clkt_dpll.c
arch/arm/mach-omap2/clock33xx_data.c
arch/arm/mach-omap2/dpll3xxx.c
arch/arm/mach-omap2/omap_hwmod.c