David S. Miller 1459143386 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ieee802154/fakehard.c A bug fix went into 'net' for ieee802154/fakehard.c, which is removed in 'net-next'. Add build fix into the merge from Stephen Rothwell in openvswitch, the logging macros take a new initial 'log' argument, a new call was added in 'net' so when we merge that in here we have to explicitly add the new 'log' arg to it else the build fails. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-21 22:28:24 -05:00
..
bsd_comp.c
Kconfig	tty/serial patches for 3.9-rc1	2013-02-21 13:41:04 -08:00
Makefile
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	net: ppp: Don't call bpf_prog_create() in ppp_lock	2014-11-11 15:15:03 -05:00
ppp_mppe.c	drivers/net/*: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
ppp_mppe.h
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: Add and use skb_copy_datagram_msg() helper.	2014-11-05 16:46:40 -05: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	pptp: fix stack info leak in pptp_getname()	2014-11-20 22:43:47 -05:00