From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 1/3] omap non critical fixes for v3.10 merge window
Date: Mon, 8 Apr 2013 10:06:19 -0700 [thread overview]
Message-ID: <20130408170619.GN10155@atomide.com> (raw)
In-Reply-To: <201304081824.35663.arnd@arndb.de>
* Arnd Bergmann <arnd@arndb.de> [130408 09:29]:
> On Tuesday 02 April 2013, Tony Lindgren wrote:
> > The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9:
> >
> > Linux 3.9-rc5 (2013-03-31 15:12:43 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/fixes-non-critical-signed
> >
> > for you to fetch changes up to 105612489bf59386b46b3f9f034e03f70e57aee6:
> >
> > Merge branch 'for_3.10/omap5_generic_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux into omap-for-v3.10/fixes-non-critical (2013-04-01 09:30:47 -0700)
> >
>
> Pulled all three branches, thanks a lot!
>
> The cleanup branch conflicted with a bug fix from Paul Walmsley that Linus
> already merged, see below for the resolution that I used, adding a modified
> line from the one Paul submitted.
Yes looks good thanks. I think I had the same resolve in one
of the other branches, but that should not cause issues with
your branches I presume.
Regards,
Tony
prev parent reply other threads:[~2013-04-08 17:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-02 17:29 [GIT PULL 1/3] omap non critical fixes for v3.10 merge window Tony Lindgren
2013-04-02 17:29 ` [GIT PULL 2/3] omap cleanup " Tony Lindgren
2013-04-02 17:29 ` [GIT PULL 3/3] omap hw crypto updates " Tony Lindgren
2013-04-08 16:24 ` [GIT PULL 1/3] omap non critical fixes " Arnd Bergmann
2013-04-08 17:06 ` Tony Lindgren [this message]
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=20130408170619.GN10155@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).