David S. Miller 8fd90bb889 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/infiniband/hw/cxgb4/device.c

The cxgb4 conflict was simply overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2014-07-22 00:44:59 -07:00

..

bsd_comp.c

ppp: Move the PPP drivers

2011-08-27 00:58:26 -07:00

Kconfig

tty/serial patches for 3.9-rc1

2013-02-21 13:41:04 -08:00

Makefile

ppp: Move the PPP drivers

2011-08-27 00:58:26 -07:00

ppp_async.c

tty: Fix recursive deadlock in tty_perform_flush()

2013-03-18 16:52:24 -07:00

ppp_deflate.c

ppp: Change copyright notices from ANU to me

2012-03-04 20:41:38 -05:00

ppp_generic.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-07-22 00:44:59 -07:00

ppp_mppe.c

drivers/net/*: Fix FSF address in file headers

2013-12-06 12:37:55 -05:00

ppp_mppe.h

ppp: Move the PPP drivers

2011-08-27 00:58:26 -07:00

ppp_synctty.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2013-05-01 14:08:52 -07:00

pppoe.c

net: pppoe: use correct channel MTU when using Multilink PPP

2014-07-14 14:35:46 -07:00

pppox.c

ppp: Replace uses of <linux/if_ppp.h> with <linux/ppp-ioctl.h>

2012-03-04 20:41:38 -05:00

pptp.c

inetpeer: get rid of ip_id_count

2014-06-02 11:00:41 -07:00