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
..
cxgb3i	libcxgbi/cxgb4i : Fix ipv6 build failure caught with randconfig	2014-08-13 20:04:47 -07:00
cxgb4i	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-21 22:28:24 -05:00
Kconfig
libcxgbi.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-21 17:20:36 -08:00
libcxgbi.h	libcxgbi : support ipv6 address host_param	2014-10-28 09:57:00 +01:00
Makefile