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
..
Kconfig	ipx: remove the BKL	2011-03-05 10:55:58 +01:00
Makefile	ipx: move peII functions	2012-07-19 10:48:00 -07:00
af_ipx.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-21 22:28:24 -05:00
ipx_proc.c	ipx: remove all unnecessary castings on ntohl	2014-10-30 15:51:43 -04:00
ipx_route.c	net: Split sk_no_check into sk_no_check_{rx,tx}	2014-05-23 16:28:53 -04:00
pe2.c	ipx: move peII functions	2012-07-19 10:48:00 -07:00
sysctl_net_ipx.c	ipx: move extern sysctl_ipx_pprop_broadcasting to header file	2014-10-27 16:03:53 -04:00