mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 12:21:37 +00:00
38abdcd0d0
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> |
||
---|---|---|
.. | ||
mach |