On Wednesday 21 December 2011, Olof Johansson wrote:
> Hi Arnd,
>
> Please pull the following cleanups for tegra. Thanks!
>
>
> The following changes since commit 5611cc4572e889b62a7b4c72a413536bf6a9c416:
>
> Linux 3.2-rc4 (2011-12-01 14:56:01 -0800)
>
> are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git for-3.3/cleanup
Pulled and resolved a conflict with Marc's "ARM: tegra2: convert to
CONFIG_MULTI_IRQ_HANDLER" patch, which leaves entry-macro.S
almost empty with these contents:
.macro disable_fiq
.endm
.macro arch_ret_to_user, tmp1, tmp2
.endm
Please confirm if this is the correct resolution.
Thanks,
Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
