iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38abdcd0d0
linux/arch/arm/mach-tegra/include/mach
History
Arnd Bergmann 38abdcd0d0 Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2 
Conflicts:
	arch/arm/mach-tegra/common.c
	arch/arm/mach-ux500/devices-common.c

This resolves two conflicts and lets us merge the exynos5 branch
cleanly.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-15 21:05:52 +00:00
..
clk.h ARM: tegra: add support for new clock framework features 2012-02-06 09:16:15 -08:00
debug-macro.S ARM: tegra: Pass uncompress.h UART selection to DEBUG_LL 2012-02-06 18:25:00 -08:00
dma.h ARM: tegra: dma: fix buildbreak for !CONFIG_TEGRA_SYSTEM_DMA 2012-01-24 00:48:06 -08:00
gpio-tegra.h gpio: tegra: Dynamically allocate IRQ base, and support DT 2012-02-06 18:25:00 -08:00
gpio.h ARM: mark empty gpio.h files empty 2011-10-29 13:05:46 +02:00
io.h ARM: mach-tegra: remove arch specific special handling for ioremap 2011-11-16 18:06:18 -05:00
iomap.h ARM: tegra: rework Tegra secondary CPU core bringup 2012-02-26 14:44:44 -08:00
irammap.h ARM: tegra: Pass uncompress.h UART selection to DEBUG_LL 2012-02-06 18:25:00 -08:00
irqs.h ARM: tegra: add support for tegra30 interrupts 2012-02-06 09:16:14 -08:00
kbc.h Input: tegra-kbc - report wakeup key for some platforms 2011-12-30 00:27:00 -08:00
pinmux-tegra20.h arm/tegra: rename tegra20 pinmux files 2011-12-17 20:15:25 -08:00
pinmux-tegra30.h arm/tegra: pinmux tables and definitions for tegra30 2011-12-17 20:15:33 -08:00
pinmux.h arm/tegra: pinmux tables and definitions for tegra30 2011-12-17 20:15:33 -08:00
powergate.h ARM: tegra: support for Tegra30 CPU powerdomains 2012-02-26 14:44:45 -08:00
sdhci.h mmc: tegra: add pm_flags 2011-05-24 20:59:30 -04:00
suspend.h ARM: tegra: Add prototypes for subsystem suspend functions 2011-02-09 21:57:01 -08:00
tegra_wm8903_pdata.h ARM: Tegra: Add to tegra_wm8903_platform_data 2011-04-18 17:55:58 +01:00
timex.h
uncompress.h ARM: tegra: Pass uncompress.h UART selection to DEBUG_LL 2012-02-06 18:25:00 -08:00
usb_phy.h ARM: tegra: Add support for Tegra USB PHYs 2011-03-11 14:22:11 -08:00