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
..
bsd_comp.c
Kconfig
Makefile
ppp_async.c
ppp_deflate.c	ppp: deflate: never return len larger than output buffer	2015-01-29 14:50:01 -08:00
ppp_generic.c	ppp: call skb_checksum_complete_unset in ppp_receive_frame	2015-04-20 21:57:26 -04:00
ppp_mppe.c	ppp: mppe: discard late packet in stateless mode	2015-04-26 23:25:13 -04:00
ppp_mppe.h
ppp_synctty.c
pppoe.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
pppox.c	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
pptp.c	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00