From: tony@atomide•com (Tony Lindgren)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL 2/5] omap board changes for v3.6 merge window
Date: Tue, 10 Jul 2012 23:51:49 -0700 [thread overview]
Message-ID: <20120711065149.GB1122@atomide.com> (raw)
In-Reply-To: <4FFCCE43.2070709@windriver.com>
* Zumeng Chen <zumeng.chen@windriver•com> [120710 17:57]:
> ? 2012?07?10? 23:34, Arnd Bergmann ??:
> >I got a conflict in arch/arm/mach-omap2/common-board-devices.c between
> >16aced80f6739 "ARM: OMAP3530evm: set pendown_state and debounce time for
> >ads7846" and 97ee9f01d6f26 "ARM: OMAP: fix the ads7846 init code",
> >see my resolution below.
> >
> >Please check if what I have in the for-next branch makese sense to you
> >all.
>
> No problem, many thanks Arnd for your information.
> I'll check it, test it, and send you feedback.
Thanks, looks good. Also I've checked that for-next builds fine with
my testconfigs.
Regards,
Tony
next prev parent reply other threads:[~2012-07-11 6:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <0M4ZFU-1RqIwX3VUq-00yonj@mx.kundenserver.de>
2012-07-10 15:34 ` [GIT PULL 2/5] omap board changes for v3.6 merge window Arnd Bergmann
2012-07-11 0:52 ` Zumeng Chen
2012-07-11 1:20 ` Zumeng Chen
2012-07-11 6:51 ` Tony Lindgren [this message]
2012-07-10 13:05 [GIT PULL 1/5] omap device tree " Tony Lindgren
2012-07-10 13:05 ` [GIT PULL 2/5] omap board " 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=20120711065149.GB1122@atomide.com \
--to=tony@atomide$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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