From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 2/5] Tegra devicetree updates for 3.3
Date: Tue, 27 Dec 2011 22:43:39 +0000 [thread overview]
Message-ID: <201112272243.39791.arnd@arndb.de> (raw)
In-Reply-To: <CAOesGMhSEbpcKXv87_cv+1b-wB7g8zmtFR2wMygByuTBv_bmvA@mail.gmail.com>
On Wednesday 21 December 2011, Olof Johansson wrote:
> Hi Arnd,
>
> Please pull the following device tree-related updates for tegra for 3.3. 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/dt
>
Pulled into a new next/dt branch, thanks!
There is a bogus conflict in arch/arm/mach-tegra/Makefile from merging
two different versions of "arm/tegra: fix variable formatting in makefile".
The patches are identical, but 317d5330 made it into tegra/dt and
584634e3 into tegra/cleanup.
Trivial to fix, but something to watch out for in the future.
Another conflict in arch/arm/mach-tegra/board-dt.c with the "ARM:
tegra2: convert to CONFIG_MULTI_IRQ_HANDLER", also trivial.
Arnd
next prev parent reply other threads:[~2011-12-27 22:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-21 19:14 [GIT PULL 2/5] Tegra devicetree updates for 3.3 Olof Johansson
2011-12-27 22:43 ` Arnd Bergmann [this message]
2011-12-27 23:25 ` Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201112272243.39791.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).