Russell King 14b6848bc0 Merge branch 'omap-clks3' into devel
Conflicts:

	arch/arm/mach-omap2/clock.c
2009-03-19 12:39:58 +00:00
..
2009-01-08 08:31:13 -08:00
2009-01-08 08:31:13 -08:00