| commit | 14b6848bc0134b8838d374c423df3edda9b1490e | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Thu Mar 19 12:39:58 2009 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Mar 19 12:39:58 2009 +0000 |
| tree | 724dc912efe84f432d33a798502811c5f5295774 | |
| parent | 05d9881bc4c6f172997b7a59e4a1a95910c4ebd7 [diff] | |
| parent | 4da3782151300237db3abe070f716922889252e0 [diff] |
Merge branch 'omap-clks3' into devel Conflicts: arch/arm/mach-omap2/clock.c