David S. Miller b04096ff33 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Four minor merge conflicts: 1) qca_spi.c renamed the local variable used for the SPI device from spi_device to spi, meanwhile the spi_set_drvdata() call got moved further up in the probe function. 2) Two changes were both adding new members to codel params structure, and thus we had overlapping changes to the initializer function. 3) 'net' was making a fix to sk_release_kernel() which is completely removed in 'net-next'. 4) In net_namespace.c, the rtnl_net_fill() call for GET operations had the command value fixed, meanwhile 'net-next' adjusted the argument signature a bit. This also matches example merge resolutions posted by Stephen Rothwell over the past two days. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-05-13 14:31:43 -04:00
..
bcm_sf2_regs.h	net: dsa: bcm_sf2: add HW bridging support	2015-02-25 17:03:38 -05:00
bcm_sf2.c	net: dsa: bcm_sf2: add HW bridging support	2015-02-25 17:03:38 -05:00
bcm_sf2.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
Kconfig	net: dsa: mv88e6171: Add other members of the family	2015-05-09 16:05:53 -04:00
Makefile	net: dsa: Add support for Marvell 88E6352	2014-10-30 14:54:10 -04:00
mv88e6xxx.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
mv88e6xxx.h	net: dsa: mv88e6xxx: Replace PHY mutex by SMI mutex	2015-05-09 16:05:53 -04:00
mv88e6060.c	net: dsa: Report known silicon revisions for Marvell 88E6060	2014-10-30 14:54:10 -04:00
mv88e6123_61_65.c	net: dsa: Converting remaining registers to mnemonics	2015-05-09 16:05:53 -04:00
mv88e6131.c	net: dsa: mv88e6131: Add support for mv88e6185	2015-05-09 16:05:53 -04:00
mv88e6171.c	net: dsa: mv88e6171: Add other members of the family	2015-05-09 16:05:53 -04:00
mv88e6352.c	net: dsa: Move mv88e6172 support into mv88e6352 family driver	2015-05-09 16:05:53 -04:00