From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 5/5] Clean-up for omap
Date: Wed, 29 Feb 2012 13:24:55 -0800 [thread overview]
Message-ID: <20120229212455.GQ18901@atomide.com> (raw)
In-Reply-To: <201202292120.07286.arnd@arndb.de>
* Arnd Bergmann <arnd@arndb.de> [120229 12:48]:
> On Wednesday 29 February 2012, Tony Lindgren wrote:
> > This is mostly changes needed for io.h removal, and one
> > patch to remove unused flag for McSPI. Note that these
> > are based on RMK's for-armsoc.
> >
> > Also, these cause a minor merge conflict for mach-omap2/Kconfig
> > with the fixes-non-critical posted in this series of pull
> > requests.
>
> Hmm, I did not see the conflict in this one, but I saw one in the
> dt branch that I fixed.
OK sounds like I did not remember correctly where the conflict was.
> I pulled this one into next/cleanup.
Thanks.
Tony
next prev parent reply other threads:[~2012-02-29 21:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <0M0SaL-1SHLTi0asf-00u7ia@mx.kundenserver.de>
2012-02-29 21:20 ` [GIT PULL 5/5] Clean-up for omap Arnd Bergmann
2012-02-29 21:24 ` Tony Lindgren [this message]
[not found] <E1S2pwp-0004tL-BA@merlin.infradead.org>
2012-03-01 0:39 ` Kevin Hilman
2012-02-29 20:15 [GIT PULL 1/5] non-critical fixes for v3.4 merge window Tony Lindgren
2012-02-29 20:15 ` [GIT PULL 5/5] Clean-up for omap Tony Lindgren
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=20120229212455.GQ18901@atomide.com \
--to=tony@atomide.com \
--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).