Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 17:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
e3a66aa33a
linux/arch/arm/mach-tegra
History
Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform 
* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-22 01:07:21 -07:00
..
include/mach Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
apbio.c ARM: tegra: switch to dmaengine 2012-09-20 19:57:38 -07:00
apbio.h ARM: tegra: apbio access using dma for tegra20 only 2012-07-06 11:48:56 -06:00
board-dt-tegra20.c Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
board-dt-tegra30.c ARM: SoC: convert Tegra to SMP operations 2012-09-13 15:35:49 +02:00
board-harmony-pcie.c ARM: dt: tegra: harmony: add regulators 2012-09-14 11:31:37 -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-pinmux.c ARM: dt: tegra20: add pinmux to device tree 2012-04-18 10:26:39 -06:00
board-pinmux.h pinctrl: tegra: refactor probe handling 2012-04-18 10:26:40 -06:00
board.h ARM: tegra: paz00: enable WiFi rfkill when booting from device tree 2012-06-20 12:37:42 -06:00
clock.c ARM: tegra: introduce tegra_cpu_car_ops structures 2012-09-13 11:41:05 -06:00
clock.h ARM: tegra: Remove duplicate code 2012-09-06 11:47:20 -06:00
common.c Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
common.h Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
cpu-tegra.c ARM: tegra: cpu-tegra: explicitly manage re-parenting 2012-09-11 10:06:14 -06:00
cpuidle.c ARM: tegra: Remove flow controller programming 2012-06-11 11:48:43 -06:00
devices.c ARM: pmu: remove arm_pmu_type enumeration 2012-08-23 11:35:51 +01:00
devices.h arm-soc: driver specific updates 2012-05-26 12:22:27 -07:00
flowctrl.c ARM: tegra: Fix flow controller accesses 2012-05-14 10:22:01 -06:00
flowctrl.h ARM: tegra: functions to access the flowcontroller 2012-02-26 14:44:42 -08:00
fuse.c ARM: tegra: use IO_ADDRESS for getting virtual address 2012-09-06 11:46:58 -06:00
fuse.h ARM: tegra: export Tegra chipid 2012-02-26 14:44:19 -08:00
gpio-names.h [ARM] tegra: add GPIO support 2010-08-05 14:57:02 -07:00
headsmp.S ARM: tegra: clean up the common assembly macros into sleep.h 2012-09-13 11:41:06 -06:00
hotplug.c Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
io.c ARM: tegra: clean-up mach/io.h 2012-03-06 21:34:41 -06:00
irq.c ARM: tegra: add support for tegra30 interrupts 2012-02-06 09:16:14 -08:00
Kconfig ARM: tegra: switch to dmaengine 2012-09-20 19:57:38 -07:00
Makefile Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
Makefile.boot ARM: tegra: Add Avionic Design Tamonten Evaluation Carrier support 2012-09-20 09:34:01 -06:00
pcie.c Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci 2012-09-04 15:01:37 +02:00
platsmp.c Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
pmc.c ARM: tegra: Add a simple PMC driver 2012-02-06 18:25:01 -08:00
pmc.h ARM: tegra: Add a simple PMC driver 2012-02-06 18:25:01 -08:00
powergate.c ARM: tegra: add clk_prepare/clk_unprepare 2012-06-11 11:53:29 -06:00
reset.c ARM: tegra: make tegra_cpu_reset_handler_enable() __init 2012-06-18 16:42:57 -07:00
reset.h ARM: tegra: rework Tegra secondary CPU core bringup 2012-02-26 14:44:44 -08:00
sleep-t20.S ARM: tegra20: add CPU hotplug support 2012-09-13 11:41:06 -06:00
sleep-t30.S ARM: tegra30: add CPU hotplug support 2012-09-13 11:41:06 -06:00
sleep.h ARM: tegra20: add CPU hotplug support 2012-09-13 11:41:06 -06:00
sleep.S ARM: tegra: clean up the common assembly macros into sleep.h 2012-09-13 11:41:06 -06:00
tegra2_emc.c ARM: tegra: Fix EMC pdata initialization from registers 2012-02-06 18:25:01 -08:00
tegra2_emc.h ARM: tegra: emc: convert tegra2_emc to a platform driver 2012-02-06 18:24:59 -08:00
tegra20_clocks_data.c ARM: tegra: introduce tegra_cpu_car_ops structures 2012-09-13 11:41:05 -06:00
tegra20_clocks.c ARM: tegra: introduce tegra_cpu_car_ops structures 2012-09-13 11:41:05 -06:00
tegra20_clocks.h ARM: Tegra: Add smp_twd clock for Tegra20 2012-09-13 11:34:29 -06:00
tegra30_clocks_data.c ARM: tegra: introduce tegra_cpu_car_ops structures 2012-09-13 11:41:05 -06:00
tegra30_clocks.c ARM: tegra: introduce tegra_cpu_car_ops structures 2012-09-13 11:41:05 -06:00
tegra30_clocks.h ARM: tegra30: clocks: fix the wrong tegra_audio_sync_clk_ops name 2012-09-06 11:47:21 -06:00
tegra_cpu_car.h ARM: tegra: introduce tegra_cpu_car_ops structures 2012-09-13 11:41:05 -06:00
timer.c ARM: tegra: add clk_prepare/clk_unprepare 2012-06-11 11:53:29 -06:00
usb_phy.c ARM: tegra: add clk_prepare/clk_unprepare 2012-06-11 11:53:29 -06:00