From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: conflicts between omap/cleanup branch and omap_dss2 tree
Date: Thu, 21 Jul 2011 16:20:21 +0200 [thread overview]
Message-ID: <201107211620.21138.arnd@arndb.de> (raw)
In-Reply-To: <1311232784.1874.3.camel@deskari>
On Thursday 21 July 2011, Tomi Valkeinen wrote:
> I've pushed a new for-next branch to
> git://gitorious.org/linux-omap-dss2/linux.git for-next. However, I
> decided to just reset it to -rc4 for now.
>
Ok, thanks!
I've removed the merge with that branch from arm-soc/for-next now.
Arnd
prev parent reply other threads:[~2011-07-21 14:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-17 21:39 conflicts between omap/cleanup branch and omap_dss2 tree Arnd Bergmann
2011-07-18 8:08 ` Tony Lindgren
2011-07-19 12:27 ` Archit Taneja
2011-07-19 12:59 ` Arnd Bergmann
2011-07-21 7:19 ` Tomi Valkeinen
2011-07-21 14:20 ` Arnd Bergmann [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=201107211620.21138.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).