From: Kevin Hilman <khilman@linaro.org>
To: Tony Lindgren <tony@atomide.com>
Cc: arm@kernel.org, linux-arm-kernel@lists.infradead.org,
linux-omap@vger.kernel.org
Subject: Re: [GIT PULL] wl1251 platform data changes for v3.14
Date: Tue, 10 Dec 2013 08:02:40 -0800 [thread overview]
Message-ID: <87bo0oae3j.fsf@linaro.org> (raw)
In-Reply-To: <52a69d42.0722440a.102e.ffffa0e3SMTPIN_ADDED_BROKEN@mx.google.com> (Tony Lindgren's message of "Mon, 9 Dec 2013 20:49:00 -0800")
Hi Tony,
Tony Lindgren <tony@atomide.com> writes:
> The following changes since commit 736e812636ea72be444b85fa7e92554967459069:
>
> ARM: OMAP2+: Remove unused platform init code and headers (2013-12-08 14:15:46 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.14/omap3-board-removal-wl1251
>
> for you to fetch changes up to ce226391aec803a49b39c22d3385057c9db02f30:
>
> Merge branch 'wl1251-pdata' into omap-for-v3.14/omap3-board-removal (2013-12-09 19:39:51 -0800)
>
> ----------------------------------------------------------------
>
> Minimal changes for the wl151 platform data that would otherwise
> cause merge conflicts between the wireless tree and linux-omap
> tree. This was discussed on the mailing lists here:
>
> http://www.spinics.net/lists/linux-omap/msg99906.html
>
> ----------------------------------------------------------------
> Luciano Coelho (1):
> wl1251: split wl251 platform data to a separate structure
>
> Sebastian Reichel (1):
> wl1251: move power GPIO handling into the driver
>
> Tony Lindgren (1):
> Merge branch 'wl1251-pdata' into omap-for-v3.14/omap3-board-removal
>
> drivers/net/wireless/ti/wilink_platform_data.c | 37 +++++++++++++++++++++-----
> drivers/net/wireless/ti/wl1251/sdio.c | 31 ++++++++++++++-------
> drivers/net/wireless/ti/wl1251/spi.c | 35 +++++++++++++++---------
> drivers/net/wireless/ti/wl1251/wl1251.h | 2 +-
> include/linux/wl12xx.h | 24 +++++++++++++++--
> 5 files changed, 97 insertions(+), 32 deletions(-)
This was sent as a pull request to arm-soc, but looks like it should be
going through the net tree.
Kevin
WARNING: multiple messages have this Message-ID (diff)
From: khilman@linaro.org (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] wl1251 platform data changes for v3.14
Date: Tue, 10 Dec 2013 08:02:40 -0800 [thread overview]
Message-ID: <87bo0oae3j.fsf@linaro.org> (raw)
In-Reply-To: <52a69d42.0722440a.102e.ffffa0e3SMTPIN_ADDED_BROKEN@mx.google.com> (Tony Lindgren's message of "Mon, 9 Dec 2013 20:49:00 -0800")
Hi Tony,
Tony Lindgren <tony@atomide.com> writes:
> The following changes since commit 736e812636ea72be444b85fa7e92554967459069:
>
> ARM: OMAP2+: Remove unused platform init code and headers (2013-12-08 14:15:46 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.14/omap3-board-removal-wl1251
>
> for you to fetch changes up to ce226391aec803a49b39c22d3385057c9db02f30:
>
> Merge branch 'wl1251-pdata' into omap-for-v3.14/omap3-board-removal (2013-12-09 19:39:51 -0800)
>
> ----------------------------------------------------------------
>
> Minimal changes for the wl151 platform data that would otherwise
> cause merge conflicts between the wireless tree and linux-omap
> tree. This was discussed on the mailing lists here:
>
> http://www.spinics.net/lists/linux-omap/msg99906.html
>
> ----------------------------------------------------------------
> Luciano Coelho (1):
> wl1251: split wl251 platform data to a separate structure
>
> Sebastian Reichel (1):
> wl1251: move power GPIO handling into the driver
>
> Tony Lindgren (1):
> Merge branch 'wl1251-pdata' into omap-for-v3.14/omap3-board-removal
>
> drivers/net/wireless/ti/wilink_platform_data.c | 37 +++++++++++++++++++++-----
> drivers/net/wireless/ti/wl1251/sdio.c | 31 ++++++++++++++-------
> drivers/net/wireless/ti/wl1251/spi.c | 35 +++++++++++++++---------
> drivers/net/wireless/ti/wl1251/wl1251.h | 2 +-
> include/linux/wl12xx.h | 24 +++++++++++++++--
> 5 files changed, 97 insertions(+), 32 deletions(-)
This was sent as a pull request to arm-soc, but looks like it should be
going through the net tree.
Kevin
next parent reply other threads:[~2013-12-10 16:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <52a69d42.0722440a.102e.ffffa0e3SMTPIN_ADDED_BROKEN@mx.google.com>
2013-12-10 16:02 ` Kevin Hilman [this message]
2013-12-10 16:02 ` [GIT PULL] wl1251 platform data changes for v3.14 Kevin Hilman
2013-12-10 17:29 ` Tony Lindgren
2013-12-10 17:29 ` Tony Lindgren
2013-12-10 4:49 Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2013-12-10 4:49 Tony Lindgren
2013-12-10 4:49 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=87bo0oae3j.fsf@linaro.org \
--to=khilman@linaro.org \
--cc=arm@kernel.org \
--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.