2cbe23e3a4
Conflicts: arch/arm/mach-tegra/Makefile arch/arm/mach-vexpress/core.h The tegra Makefile was changed in four different branches in the same line. This merge should reduce the amount of churn. Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
clk.h | ||
debug-macro.S | ||
dma.h | ||
gpio-tegra.h | ||
gpio.h | ||
io.h | ||
iomap.h | ||
irqs.h | ||
kbc.h | ||
pinmux-tegra20.h | ||
pinmux-tegra30.h | ||
pinmux.h | ||
powergate.h | ||
sdhci.h | ||
suspend.h | ||
tegra_wm8903_pdata.h | ||
timex.h | ||
uncompress.h | ||
usb_phy.h |