* [GIT PULL] wl1251 platform data changes for v3.14
@ 2013-12-10 4:49 Tony Lindgren
0 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2013-12-10 4:49 UTC (permalink / raw)
To: arm; +Cc: linux-arm-kernel, linux-omap
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(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] wl1251 platform data changes for v3.14
@ 2013-12-10 4:49 Tony Lindgren
0 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2013-12-10 4:49 UTC (permalink / raw)
To: arm; +Cc: linux-omap, linux-arm-kernel
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(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] wl1251 platform data changes for v3.14
[not found] <52a69d42.0722440a.102e.ffffa0e3SMTPIN_ADDED_BROKEN@mx.google.com>
@ 2013-12-10 16:02 ` Kevin Hilman
2013-12-10 17:29 ` Tony Lindgren
0 siblings, 1 reply; 4+ messages in thread
From: Kevin Hilman @ 2013-12-10 16:02 UTC (permalink / raw)
To: Tony Lindgren; +Cc: arm, linux-arm-kernel, linux-omap
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] wl1251 platform data changes for v3.14
2013-12-10 16:02 ` [GIT PULL] wl1251 platform data changes for v3.14 Kevin Hilman
@ 2013-12-10 17:29 ` Tony Lindgren
0 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2013-12-10 17:29 UTC (permalink / raw)
To: Kevin Hilman; +Cc: arm, linux-arm-kernel, linux-omap
* Kevin Hilman <khilman@linaro.org> [131210 08:03]:
> 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.
Oh this was to merge in a shared branch between wireless tree and
linux-omap to avoid merge conflicts as agreed with John Linville,
see the link above.
But let's wait on this one too as it seems at least Russell needs
some more time to deal with the dropping of legacy booting.
Regards,
Tony
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-12-10 17:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <52a69d42.0722440a.102e.ffffa0e3SMTPIN_ADDED_BROKEN@mx.google.com>
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 4:49 Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2013-12-10 4:49 Tony Lindgren
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).