public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-omap <linux-omap@vger.kernel.org>
Subject: Re: [GIT PULL]: linux-omap DSS
Date: Tue, 22 Feb 2011 11:01:19 -0800	[thread overview]
Message-ID: <20110222190119.GN15225@atomide.com> (raw)
In-Reply-To: <1298369379.2590.41.camel@deskari>

Hi,

* Tomi Valkeinen <tomi.valkeinen@ti.com> [110222 02:07]:
> Hi Tony,
> 
> The following mach-omap2 patches have been reviewed and are in DSS tree,
> but cause easily conflicts with linux-omap tree.
> 
> Would it be possible for you to pull these into linux-omap? 

Sure, but see below.
 
> The patches are based on today's linux-omap/master.

Can you please base thes on current omap-for-linus at
04aa67dec63b61c1a8b9b6d001262250f1a92130? (Just pushed it
with the omap4 hwmod fix for timer1)

I can't pull in the master branch into omap-for-linus as that
contains years of history of temporary commits.

Regards,

Tony

  reply	other threads:[~2011-02-22 19:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-22 10:09 [GIT PULL]: linux-omap DSS Tomi Valkeinen
2011-02-22 19:01 ` Tony Lindgren [this message]
2011-02-23  7:43   ` Tomi Valkeinen
2011-02-23 20:13     ` 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=20110222190119.GN15225@atomide.com \
    --to=tony@atomide.com \
    --cc=linux-omap@vger.kernel.org \
    --cc=tomi.valkeinen@ti.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox