Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-23 11:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
e0d20b69d3
linux/arch/arm/mach-tegra
History
Olof Johansson e0d20b69d3 Merge branch 'gic/cleanup' into next/soc 
Merge in the gic cleanup since it has a handful of annoying internal conflicts
with soc development branches. All of them are delete/delete conflicts.

* gic/cleanup:
  irqchip: vic: add include of linux/irq.h
  irqchip: gic: Perform the gic_secondary_init() call via CPU notifier
  irqchip: gic: Call handle_bad_irq() directly
  arm: Move chained_irq_(enter|exit) to a generic file
  arm: Move the set_handle_irq and handle_arch_irq declarations to asm/irq.h

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

Conflicts:
	arch/arm/mach-shmobile/smp-emev2.c
	arch/arm/mach-shmobile/smp-r8a7779.c
	arch/arm/mach-shmobile/smp-sh73a0.c
	arch/arm/mach-socfpga/platsmp.c
2013-04-28 15:06:56 -07:00
..
include/mach arm-soc: soc-specific updates 2013-02-21 15:27:22 -08:00
apbio.c ARM: tegra: Make variables static 2013-01-28 10:21:28 -07:00
apbio.h ARM: tegra: apbio access using dma for tegra20 only 2012-07-06 11:48:56 -06:00
board-harmony-pcie.c ARM: tegra: fix ignored return value of regulator_enable 2013-03-11 14:29:23 -06:00
board-paz00.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
board-paz00.h ARM: tegra: remove board (but not DT) support for Paz00 2012-09-14 11:31:36 -06:00
board.h ARM: tegra: Unify tegra{20,30,114}_init_early() 2013-03-11 14:29:43 -06:00
common.c ARM: tegra: pm: add platform suspend support 2013-04-03 14:31:41 -06:00
common.h ARM: tegra: moving the clock gating procedure to tegra_cpu_kill 2013-01-28 10:21:48 -07:00
cpu-tegra.c arm-soc: soc-specific updates 2013-02-21 15:27:22 -08:00
cpuidle-tegra20.c ARM: tegra: cpuidle: remove redundant parameters for powered-down mode 2013-04-03 14:45:42 -06:00
cpuidle-tegra30.c ARM: tegra: cpuidle: remove redundant parameters for powered-down mode 2013-04-03 14:45:42 -06:00
cpuidle-tegra114.c ARM: tegra: add Tegra114 ARM_CPUIDLE_WFI_STATE support 2013-01-29 11:01:23 -07:00
cpuidle.c ARM: tegra: add Tegra114 ARM_CPUIDLE_WFI_STATE support 2013-01-29 11:01:23 -07:00
cpuidle.h ARM: tegra: add Tegra114 ARM_CPUIDLE_WFI_STATE support 2013-01-29 11:01:23 -07:00
flowctrl.c ARM: tegra20: flowctrl: add support for cpu_suspend_enter/exit 2013-01-28 11:20:38 -07:00
flowctrl.h ARM: tegra20: flowctrl: add support for cpu_suspend_enter/exit 2013-01-28 11:20:38 -07:00
fuse.c ARM: tegra: add speedo-based process id for Tegra114 2013-03-19 11:52:06 -06:00
fuse.h ARM: tegra: add speedo-based process id for Tegra114 2013-03-19 11:52:06 -06:00
gpio-names.h
headsmp.S ARM: tegra: don't unlock MMIO access to DBGLAR 2013-03-11 14:29:22 -06:00
hotplug.c ARM: tegra: Unify tegra{20,30,114}_init_early() 2013-03-11 14:29:43 -06: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: remove USB address related macros from iomap.h 2013-01-28 11:20:04 -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: irq: add wake up handling 2013-04-03 14:31:32 -06:00
irq.h ARM: tegra: irq: add wake up handling 2013-04-03 14:31:32 -06:00
Kconfig ARM: tegra: sort Kconfig selects for Tegra114 2013-02-09 17:52:07 -08:00
Makefile ARM: tegra: add speedo-based process id for Tegra114 2013-03-19 11:52:06 -06:00
Makefile.boot ARM: tegra: Add Avionic Design Tamonten Evaluation Carrier support 2012-09-20 09:34:01 -06:00
pcie.c ARM: tegra: migrate to new clock code 2013-01-28 11:19:07 -07:00
platsmp.c Merge branch 'gic/cleanup' into next/soc 2013-04-28 15:06:56 -07:00
pm.c ARM: tegra: core SoC support development 2013-04-09 16:32:20 +02:00
pm.h ARM: tegra: pm: fix build error w/o PM_SLEEP 2013-04-18 09:34:13 -07:00
pmc.c ARM: tegra: pm: add platform suspend support 2013-04-03 14:31:41 -06:00
pmc.h ARM: tegra: pm: add platform suspend support 2013-04-03 14:31:41 -06:00
powergate.c ARM: tegra: migrate to new clock code 2013-01-28 11:19:07 -07:00
reset-handler.S ARM: tegra: don't unlock MMIO access to DBGLAR 2013-03-11 14:29:22 -06:00
reset.c ARM: tegra: make device can run on UP 2013-01-28 11:14:06 -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: tegra20: cpuidle: apply coupled cpuidle for powered-down mode 2013-01-28 11:20:38 -07:00
sleep-tegra30.S ARM: tegra: update the cache maintenance order for CPU shutdown 2013-01-28 10:21:44 -07:00
sleep.h ARM: tegra: Unify tegra{20,30,114}_init_early() 2013-03-11 14:29:43 -06:00
sleep.S ARM: tegra20: cpuidle: apply coupled cpuidle for powered-down mode 2013-01-28 11:20:38 -07:00
tegra2_emc.c ARM: Convert to devm_ioremap_resource() 2013-01-25 12:21:45 -08:00
tegra2_emc.h
tegra20_speedo.c ARM: tegra: Add speedo-based process identification 2012-11-15 14:34:20 -07:00
tegra30_speedo.c ARM: tegra: Tegra30 speedo-based process identification 2012-11-15 14:36:59 -07:00
tegra114_speedo.c ARM: tegra: add speedo-based process id for Tegra114 2013-03-19 11:52:06 -06:00
tegra.c ARM: tegra: expose chip ID and revision 2013-03-15 12:49:15 -06:00