e067096c8d
Conflicts: arch/arm/mach-tegra/board-harmony-pcie.c To fix an internal merge conflict between the tegra/soc and tegra/boards branches. Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
bootp | ||
compressed | ||
dts | ||
.gitignore | ||
install.sh | ||
Makefile |