OpenCloudOS-Kernel/Documentation/devicetree
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
..
bindings Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-11-21 22:28:24 -05:00
00-INDEX
booting-without-of.txt dt/documentation: add specification of dma bus information 2014-09-26 11:18:05 -05:00
changesets.txt of: Transactional DT support. 2014-07-23 17:29:15 -06:00
dynamic-resolution-notes.txt of: Introduce Device Tree resolve support. 2014-10-04 21:24:26 +01:00
of_selftest.txt To remove non-ascii characters in of_selftest.txt 2014-10-06 09:52:39 +01:00
todo.txt of: Add todo tasklist for Devicetree 2014-07-23 17:33:01 -06:00
usage-model.txt