Merge branch 'for_2.6.33rc_c' of git://git.pwsan.com/linux-2.6 into omap-fixes-for...
authorTony Lindgren <tony@atomide.com>
Fri, 8 Jan 2010 22:27:56 +0000 (14:27 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 8 Jan 2010 22:27:56 +0000 (14:27 -0800)
1  2 
arch/arm/mach-omap1/clock_data.c

Simple merge