Doug / smarc-fsl-linux-kernel

06 Feb, 2013

1 commit

  • f0390669d   Merge tag 'tegra-for-3.9-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/g… ... Browse Code »

    …it/swarren/linux-tegra into next/cleanup

    From Stephen Warren:
    ARM: tegra: cleanup

    This pull request contains various cleanup and minor changes to core
    Tegra code:
    * Tegra clocksource driver is moved to drivers/clocksource.
    * Various typos, warning cleanup, statics cleanup, section mismatch
    fixes, etc.
    * Various small fixes/cleanups for CPU/hotplug/SMP code.

    This pull request is based on a merge of v3.8-rc3 and at least part of
    arm-soc's timer/cleanup branch.

    * tag 'tegra-for-3.9-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
    ARM: tegra: fix compile error when disable CPU_IDLE
    ARM: tegra30: make the wait time of CPU power up to proportional to HZ
    ARM: tegra: make device can run on UP
    ARM: tegra: clean up the CPUINIT section
    ARM: tegra: moving the clock gating procedure to tegra_cpu_kill
    ARM: tegra: update the cache maintenance order for CPU shutdown
    ARM: tegra30: fix power up sequence for boot_secondary
    ARM: tegra: cpufreq: move clk_get/put out of function tegra_cpu_init/exit
    ARM: tegra: fix Kconfig warnings when !SMP
    ARM: tegra: Make variables static
    clocksource: tegra: cosmetic: Fix error message
    ARM: tegra: move timer.c to drivers/clocksource/

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

    Trivial conflicts:
    arch/arm/mach-tegra/board-dt-tegra20.c
    arch/arm/mach-tegra/board-dt-tegra30.c
    drivers/clocksource/Makefile

    Olof Johansson
     

29 Jan, 2013

2 commits