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
..
2014-11-16 16:21:57 -08:00
2014-10-29 00:18:20 +00:00
2014-10-08 17:22:23 -04:00
2014-10-14 23:31:13 -07:00
2014-10-14 23:31:13 -07:00
2014-09-11 18:11:53 +00:00
2014-10-11 20:29:01 -04:00