From: Olof Johansson <olof@lixom.net>
To: Tony Lindgren <tony@atomide.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org
Subject: Re: [GIT PULL] omap fixes for v3.11 merge window
Date: Fri, 12 Jul 2013 10:57:17 -0700 [thread overview]
Message-ID: <20130712175717.GA27575@quad.lixom.net> (raw)
In-Reply-To: <20130710080241.GN5523@atomide.com>
On Wed, Jul 10, 2013 at 01:02:41AM -0700, Tony Lindgren wrote:
> The following changes since commit ddcf6600b133697adbafd96e080818bdc0dfd028:
>
> Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (2013-07-03 19:56:35 -0700)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/fixes-for-merge-window
Thanks, merged. There was a quite verbose merge conflict due to the changes of
the Kconfig in our fixes branch, so please double-check my resolution.
-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] omap fixes for v3.11 merge window
Date: Fri, 12 Jul 2013 10:57:17 -0700 [thread overview]
Message-ID: <20130712175717.GA27575@quad.lixom.net> (raw)
In-Reply-To: <20130710080241.GN5523@atomide.com>
On Wed, Jul 10, 2013 at 01:02:41AM -0700, Tony Lindgren wrote:
> The following changes since commit ddcf6600b133697adbafd96e080818bdc0dfd028:
>
> Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (2013-07-03 19:56:35 -0700)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/fixes-for-merge-window
Thanks, merged. There was a quite verbose merge conflict due to the changes of
the Kconfig in our fixes branch, so please double-check my resolution.
-Olof
next prev parent reply other threads:[~2013-07-12 17:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-10 8:02 [GIT PULL] omap fixes for v3.11 merge window Tony Lindgren
2013-07-10 8:02 ` Tony Lindgren
2013-07-12 17:57 ` Olof Johansson [this message]
2013-07-12 17:57 ` Olof Johansson
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=20130712175717.GA27575@quad.lixom.net \
--to=olof@lixom.net \
--cc=arnd@arndb.de \
--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.