diff options
| author |  Russell King <rmk@dyn-67.arm.linux.org.uk>
| 2009-03-19 12:39:58 +0000 |
|---|---|---|
| committer |  Russell King <rmk+kernel@arm.linux.org.uk>
| 2009-03-19 12:39:58 +0000 |
| commit | 14b6848bc0134b8838d374c423df3edda9b1490e (patch) | |
| tree | 724dc912efe84f432d33a798502811c5f5295774 /arch/arm/mach-pxa/reset.c | |
| parent | Merge branch 'for-russell' of git://git.kernel.org/pub/scm/linux/kernel/git/c... (diff) | |
| parent | [ARM] omap: clk_set_parent: deny changing parent if clock is enabled (diff) | |
| download | linux-14b6848bc0134b8838d374c423df3edda9b1490e.tar.gz linux-14b6848bc0134b8838d374c423df3edda9b1490e.tar.bz2 linux-14b6848bc0134b8838d374c423df3edda9b1490e.zip | |
Merge branch 'omap-clks3' into devel
Conflicts:
arch/arm/mach-omap2/clock.c
Diffstat (limited to 'arch/arm/mach-pxa/reset.c')
0 files changed, 0 insertions, 0 deletions