lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8d84981e39
linux-kernel-test/arch/arm/mach-tegra
History
Olof Johansson 8d84981e39 Merge branch 'clocksource/cleanup' into next/cleanup 
Clockevent cleanup series from Shawn Guo.

Resolved move/change conflict in mach-pxa/time.c due to the sys_timer
cleanup.

* clocksource/cleanup:
  clocksource: use clockevents_config_and_register() where possible
  ARM: use clockevents_config_and_register() where possible
  clockevents: export clockevents_config_and_register for module use
  + sync to Linux 3.8-rc3

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/mach-pxa/time.c
2013-01-14 10:20:02 -08:00
..
include/mach ARM: tegra: move debug-macro.S to include/debug 2012-11-16 12:22:18 -07:00
apbio.c ARM: tegra: move iomap.h to mach-tegra 2012-11-05 11:36:06 -07:00
apbio.h
board-dt-tegra20.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-dt-tegra30.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-harmony-pcie.c
board-paz00.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
board-paz00.h
board.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
clock.c ARM: tegra: remove unnecessary includes of <mach/*.h> 2012-11-05 11:36:05 -07:00
clock.h
common.c Merge tag 'tegra-for-3.8-fixes-for-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into fixes 2012-12-17 10:04:27 -08:00
common.h Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
cpu-tegra.c ARM: tegra: remove unnecessary includes of <mach/*.h> 2012-11-05 11:36:05 -07:00
cpuidle-tegra20.c ARM: tegra: cpuidle: separate cpuidle driver for different chips 2012-11-15 15:09:20 -07:00
cpuidle-tegra30.c ARM: tegra30: cpuidle: add powered-down state for CPU0 2012-11-15 15:09:22 -07:00
cpuidle.c ARM: tegra: cpuidle: separate cpuidle driver for different chips 2012-11-15 15:09:20 -07:00
cpuidle.h ARM: tegra: cpuidle: separate cpuidle driver for different chips 2012-11-15 15:09:20 -07:00
flowctrl.c ARM: tegra30: flowctrl: add cpu_suspend_exter/exit function 2012-11-15 15:09:21 -07:00
flowctrl.h ARM: tegra30: flowctrl: add cpu_suspend_exter/exit function 2012-11-15 15:09:21 -07:00
fuse.c ARM: tegra: Tegra30 speedo-based process identification 2012-11-15 14:36:59 -07:00
fuse.h ARM: tegra: Tegra30 speedo-based process identification 2012-11-15 14:36:59 -07:00
gpio-names.h
headsmp.S ARM: tegra: retain L2 content over CPU suspend/resume 2012-11-15 15:09:22 -07:00
hotplug.c Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
io.c ARM: tegra: don't include iomap.h from debug-macro.S 2012-11-16 12:22:17 -07:00
iomap.h ARM: tegra: simplify DEBUG_LL UART selection options 2012-11-16 12:22:17 -07:00
irammap.h ARM: tegra: decouple uncompress.h and debug-macro.S 2012-11-16 12:22:17 -07:00
irq.c ARM: tegra: move iomap.h to mach-tegra 2012-11-05 11:36:06 -07:00
Kconfig Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-12-13 12:00:02 -08:00
Makefile ARM: tegra30: cpuidle: add powered-down state for secondary CPUs 2012-11-15 15:09:21 -07:00
Makefile.boot
pcie.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
platsmp.c ARM: tegra: move iomap.h to mach-tegra 2012-11-05 11:36:06 -07:00
pm.c ARM: tegra: retain L2 content over CPU suspend/resume 2012-11-15 15:09:22 -07:00
pm.h ARM: tegra: retain L2 content over CPU suspend/resume 2012-11-15 15:09:22 -07:00
pmc.c ARM: tegra: move iomap.h to mach-tegra 2012-11-05 11:36:06 -07:00
pmc.h
powergate.c ARM: tegra: move iomap.h to mach-tegra 2012-11-05 11:36:06 -07:00
reset.c ARM: tegra: cpuidle: add CPU resume function 2012-11-15 15:09:21 -07:00
reset.h ARM: tegra30: cpuidle: add powered-down state for secondary CPUs 2012-11-15 15:09:21 -07:00
sleep-tegra20.S ARM: tegra: rename the file of "sleep-tXX" to "sleep-tegraXX" 2012-11-15 15:09:01 -07:00
sleep-tegra30.S ARM: tegra30: cpuidle: add powered-down state for CPU0 2012-11-15 15:09:22 -07:00
sleep.h ARM: tegra: retain L2 content over CPU suspend/resume 2012-11-15 15:09:22 -07:00
sleep.S ARM: tegra: retain L2 content over CPU suspend/resume 2012-11-15 15:09:22 -07:00
tegra2_emc.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
tegra2_emc.h
tegra20_clocks_data.c ARM: tegra: Add Tegra20 host1x clock support 2012-11-15 14:46:26 -07:00
tegra20_clocks.c ARM: tegra: move iomap.h to mach-tegra 2012-11-05 11:36:06 -07:00
tegra20_clocks.h
tegra20_speedo.c ARM: tegra: Add speedo-based process identification 2012-11-15 14:34:20 -07:00
tegra30_clocks_data.c ARM: tegra: Add Tegra30 host1x clock support 2012-11-15 14:46:29 -07:00
tegra30_clocks.c Merge tag 'tegra-for-3.8-fixes-for-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into fixes 2012-12-17 10:04:27 -08:00
tegra30_clocks.h ARM: tegra30: clocks: add AHB and APB clocks 2012-11-05 11:36:22 -07:00
tegra30_speedo.c ARM: tegra: Tegra30 speedo-based process identification 2012-11-15 14:36:59 -07:00
tegra_cpu_car.h ARM: tegra30: clocks: add CPU low-power function into tegra_cpu_car_ops 2012-11-15 15:09:21 -07:00
timer.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00