projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7185684
6bb27d7
)
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
author
Jon Hunter
<jon-hunter@ti.com>
Mon, 1 Apr 2013 18:47:29 +0000
(13:47 -0500)
committer
Jon Hunter
<jon-hunter@ti.com>
Mon, 1 Apr 2013 18:47:29 +0000
(13:47 -0500)
14 files changed:
1
2
arch/arm/mach-davinci/board-dm646x-evm.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-highbank/highbank.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-integrator/integrator_ap.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-integrator/integrator_cp.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-kirkwood/board-dt.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-ks8695/board-acs5k.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-nomadik/board-nhk8815.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap1/board-ams-delta.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/board-omap3beagle.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/board-omap4panda.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/timer.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-s3c64xx/mach-crag6410.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-ux500/cpu-db8500.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/plat-samsung/include/plat/cpu.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-davinci/board-dm646x-evm.c
Simple merge
diff --cc
arch/arm/mach-highbank/highbank.c
index e6c06128293962b24adbe84892e19d4a876ff373,f6ca285ee5c51296e943a48071b723e9e93c49ac..ff7a4fa488dc2c85513aa8a4f3b45fa3154fd2cf
---
1
/
arch/arm/mach-highbank/highbank.c
---
2
/
arch/arm/mach-highbank/highbank.c
+++ b/
arch/arm/mach-highbank/highbank.c
@@@
-130,13
-129,9
+130,9
@@@
static void __init highbank_timer_init(
arch_timer_sched_clock_init();
}
- static struct sys_timer highbank_timer = {
- .init = highbank_timer_init,
- };
-
static void highbank_power_off(void)
{
- hig
n
bank_set_pwr_shutdown();
+ hig
h
bank_set_pwr_shutdown();
while (1)
cpu_do_idle();
diff --cc
arch/arm/mach-integrator/integrator_ap.c
Simple merge
diff --cc
arch/arm/mach-integrator/integrator_cp.c
Simple merge
diff --cc
arch/arm/mach-kirkwood/board-dt.c
Simple merge
diff --cc
arch/arm/mach-ks8695/board-acs5k.c
Simple merge
diff --cc
arch/arm/mach-nomadik/board-nhk8815.c
Simple merge
diff --cc
arch/arm/mach-omap1/board-ams-delta.c
Simple merge
diff --cc
arch/arm/mach-omap2/board-omap3beagle.c
Simple merge
diff --cc
arch/arm/mach-omap2/board-omap4panda.c
Simple merge
diff --cc
arch/arm/mach-omap2/timer.c
Simple merge
diff --cc
arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge
diff --cc
arch/arm/mach-ux500/cpu-db8500.c
Simple merge
diff --cc
arch/arm/plat-samsung/include/plat/cpu.h
Simple merge