David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
wl12xx	wlcore: split wl12xx/wl18xx sg parameters	2015-12-11 13:10:59 +02:00
wl18xx	wlcore/wl18xx: fw logger over sdio	2015-12-31 10:19:47 +02:00
wl1251	ti: unify Kconfig with other vendors	2015-11-18 14:28:31 +02:00
wlcore	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
Kconfig	ti: unify Kconfig with other vendors	2015-11-18 14:28:31 +02:00
Makefile	wlcore: move wl12xx_platform_data up and make it truly optional	2013-02-08 10:05:02 +02:00
wilink_platform_data.c	wlcore: remove wl12xx_platform_data	2015-03-24 09:48:14 -07:00