From: Olof Johansson <olof@lixom.net>
To: Tony Lindgren <tony@atomide.com>
Cc: arm@kernel.org, linux-arm-kernel@lists.infradead.org,
linux-omap@vger.kernel.org
Subject: Re: [GIT PULL 5/5] omap dts changes for v3.18 merge window
Date: Tue, 23 Sep 2014 22:13:09 -0700 [thread overview]
Message-ID: <20140924051309.GB30340@localhost> (raw)
In-Reply-To: <20140918201507.GO14505@atomide.com>
On Thu, Sep 18, 2014 at 01:15:08PM -0700, Tony Lindgren wrote:
> * Tony Lindgren <tony@atomide.com> [140911 16:29]:
> > The following changes since commit 69e273c0b0a3c337a521d083374c918dc52c666f:
> >
> > Linux 3.17-rc3 (2014-08-31 18:23:04 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/dt-for-v3.18
> >
> > for you to fetch changes up to d27704d1ec2f9ba06247b402c58a6f2febecef78:
> >
> > ARM: dts: OMAP2+: Add sub mailboxes device node information (2014-09-11 11:46:30 -0700)
> >
> > ----------------------------------------------------------------
> > Changes for .dts files for omaps for v3.18 merge window:
> >
> > - Updates for gta04 to add gta04a3 model
> > - Add support for Tehnexion TAO3530 boards
> > - Regulator names for beaglebone
> > - Pinctrl related updates for omap5, dra7 and am437
> > - Model name fix for sbc-t54
> > - Enable mailbox for various omaps
>
> This can cause a minor merge conflict, here's the
> merge resolution for reference.
Thanks, merged all branches now.
-Olof
WARNING: multiple messages have this Message-ID (diff)
From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 5/5] omap dts changes for v3.18 merge window
Date: Tue, 23 Sep 2014 22:13:09 -0700 [thread overview]
Message-ID: <20140924051309.GB30340@localhost> (raw)
In-Reply-To: <20140918201507.GO14505@atomide.com>
On Thu, Sep 18, 2014 at 01:15:08PM -0700, Tony Lindgren wrote:
> * Tony Lindgren <tony@atomide.com> [140911 16:29]:
> > The following changes since commit 69e273c0b0a3c337a521d083374c918dc52c666f:
> >
> > Linux 3.17-rc3 (2014-08-31 18:23:04 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/dt-for-v3.18
> >
> > for you to fetch changes up to d27704d1ec2f9ba06247b402c58a6f2febecef78:
> >
> > ARM: dts: OMAP2+: Add sub mailboxes device node information (2014-09-11 11:46:30 -0700)
> >
> > ----------------------------------------------------------------
> > Changes for .dts files for omaps for v3.18 merge window:
> >
> > - Updates for gta04 to add gta04a3 model
> > - Add support for Tehnexion TAO3530 boards
> > - Regulator names for beaglebone
> > - Pinctrl related updates for omap5, dra7 and am437
> > - Model name fix for sbc-t54
> > - Enable mailbox for various omaps
>
> This can cause a minor merge conflict, here's the
> merge resolution for reference.
Thanks, merged all branches now.
-Olof
next prev parent reply other threads:[~2014-09-24 5:38 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-11 23:28 [GIT PULL 1/5] non-urgent omap fixes for v3.18 merge window Tony Lindgren
2014-09-11 23:28 ` [GIT PULL 2/5] omap soc changes " Tony Lindgren
2014-09-11 23:28 ` Tony Lindgren
2014-09-11 23:28 ` Tony Lindgren
2014-09-11 23:28 ` [GIT PULL 3/5] omap intc " Tony Lindgren
2014-09-11 23:28 ` Tony Lindgren
2014-09-11 23:28 ` Tony Lindgren
2014-09-11 23:28 ` [GIT PULL 4/5] omap mailbox " Tony Lindgren
2014-09-11 23:28 ` Tony Lindgren
2014-09-11 23:28 ` Tony Lindgren
2014-09-11 23:28 ` [GIT PULL 5/5] omap dts " Tony Lindgren
2014-09-18 20:15 ` Tony Lindgren
2014-09-18 20:15 ` Tony Lindgren
2014-09-24 5:13 ` Olof Johansson [this message]
2014-09-24 5:13 ` Olof Johansson
2014-09-11 23:28 ` Tony Lindgren
2014-09-11 23:28 ` Tony Lindgren
[not found] ` <5412304a.04a8440a.56eb.ffff9329SMTPIN_ADDED_BROKEN@mx.google.com>
2014-09-24 5:07 ` [GIT PULL 2/5] omap soc " Olof Johansson
2014-09-24 5:07 ` Olof Johansson
2014-09-24 15:23 ` Nishanth Menon
2014-09-24 15:23 ` Nishanth Menon
2014-09-24 15:46 ` Tony Lindgren
2014-09-24 15:46 ` 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=20140924051309.GB30340@localhost \
--to=olof@lixom.net \
--cc=arm@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.