Merge branch 'omap-clock-upstream' of git://git.pwsan.com/linux-2.6 into for-next
authorTony Lindgren <tony@atomide.com>
Tue, 26 May 2009 21:41:35 +0000 (14:41 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 26 May 2009 21:41:35 +0000 (14:41 -0700)
commit88b6f7eb9b4a06fbfe27f2d98e249577f4cfdaef
tree9ef0d7ecd3e0551ca4d13ac0134aeb3ecd8558c7
parent8f9ccfeeb2cecb54dd093119291ab271ab0fd94a
parent7971687094ef48695aa56a0c03416b609bd4d1fd
Merge branch 'omap-clock-upstream' of git://git.pwsan.com/linux-2.6 into for-next
arch/arm/mach-omap2/clock.c
arch/arm/mach-omap2/clock24xx.c
arch/arm/mach-omap2/clock34xx.c
arch/arm/plat-omap/sram.c