From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Jarkko Nikula <jhnikula@gmail.com>
Cc: alsa-devel@alsa-project.org, linux-omap@vger.kernel.org,
Liam Girdwood <lrg@slimlogic.co.uk>,
Paul Walmsley <paul@pwsan.com>, Tony Lindgren <tony@atomide.com>
Subject: Re: [PATCH] omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes
Date: Mon, 4 Oct 2010 08:04:43 -0700 [thread overview]
Message-ID: <20101004150442.GC1505@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1286193893-22131-1-git-send-email-jhnikula@gmail.com>
On Mon, Oct 04, 2010 at 03:04:53PM +0300, Jarkko Nikula wrote:
> Upcoming ASoC multi-component and OMAP hwmod changes will conflict
> in arch/arm/mach-omap2/devices.c. Avoid this by moving a little bit
> include statement introduced by ASoC Multi-Component Support patch.
>
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> Cc: Paul Walmsley <paul@pwsan.com>
> Cc: Tony Lindgren <tony@atomide.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
next prev parent reply other threads:[~2010-10-04 15:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-04 12:04 [PATCH] omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes Jarkko Nikula
2010-10-04 15:04 ` Mark Brown [this message]
2010-10-04 19:49 ` [alsa-devel] " Liam Girdwood
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=20101004150442.GC1505@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=jhnikula@gmail.com \
--cc=linux-omap@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
--cc=paul@pwsan.com \
--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.