]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge tag 'omap-devel-am33xx-data-for-v3.6' of git://git.kernel.org/pub/scm/linux...
authorArnd Bergmann <arnd@arndb.de>
Tue, 10 Jul 2012 15:41:13 +0000 (17:41 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 10 Jul 2012 15:41:13 +0000 (17:41 +0200)
From Tony Lindgren <tony@atomide.com>:

This branch adds clock data for am33xx. Note that eventually these
will use the common clock framework, but those patches are not quite
ready yet for omaps. This branch depends on omap-cleanup-part2-for-v3.6
branch.

* tag 'omap-devel-am33xx-data-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP3+: clock33xx: Add AM33XX clock tree data
  ARM: OMAP3+: clock: Move common clksel_rate & clock data to common file

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
arch/arm/mach-omap2/clock44xx_data.c

Simple merge