[GIT PULL 1/5] Tegra cleanups for 3.3
olof at lixom.net
Tue Dec 27 17:22:31 EST 2011
On Tue, Dec 27, 2011 at 2:19 PM, Arnd Bergmann <arnd at arndb.de> wrote:
> 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
> .macro arch_ret_to_user, tmp1, tmp2
> Please confirm if this is the correct resolution.
Yep, that's the expected resolution. Thanks!
More information about the linux-arm-kernel