From: Felipe Balbi <me@felipebalbi.com>
To: Tony Lindgren <tony@atomide.com>
Cc: Felipe Balbi <balbi@ti.com>,
Linux OMAP Mailing List <linux-omap@vger.kernel.org>
Subject: Re: [GIT PULL] USB patches
Date: Tue, 22 Feb 2011 22:01:19 +0200 [thread overview]
Message-ID: <1298404879.1789.5.camel@eowin> (raw)
In-Reply-To: <20110222190129.GO15225@atomide.com>
On Tue, 2011-02-22 at 11:01 -0800, Tony Lindgren wrote:
> * Felipe Balbi <balbi@ti.com> [110217 23:33]:
> > Hi Tony,
> >
> > Here's a pull request for the changes we need to get into the upcoming
> > merge window. These have been tested overnight on pandaboard.
> >
> > I also checked that it merges cleanly with your omap-for-linus branch.
>
> Thanks pulled. Looks like there were few merge confclicts with
> the omap2/3 hwmod data, but got those sorted out.
conflict resolution was huge but at a first glance it looks ok.
Tomorrow I'll check if there aren't any conflicts between your for-next
and Greg's usb-next branch.
--
balbi
next prev parent reply other threads:[~2011-02-22 20:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-18 7:35 [GIT PULL] USB patches Felipe Balbi
2011-02-22 19:01 ` Tony Lindgren
2011-02-22 20:01 ` Felipe Balbi [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-05-18 10:44 [GIT PULL] USB Patches Felipe Balbi
2011-05-23 6:12 ` Felipe Balbi
2011-05-24 8:50 ` 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=1298404879.1789.5.camel@eowin \
--to=me@felipebalbi.com \
--cc=balbi@ti.com \
--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 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).