25 Mar
2015
25 Mar
'15
6:46 p.m.
On Tue, 2015-03-24 at 09:21 -0600, Stephen Warren wrote:
diff --git a/arch/arm/mach-tegra/tegra20/funcmux.c b/arch/arm/mach-tegra/tegra20/funcmux.c
Note that this will conflict with:
09f455dca749 ARM: tegra: collect SoC sources into mach-tegra
... which moved that file.
I had another look but believe above mentioned commit actually did the following:
arch/arm/cpu/tegra20-common/* -> arch/arm/mach-tegra/tegra20/*
And my commit was already rebased to latest master and therefore already took that into account or am I missing something here?