David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2016-02-23 00:09:14 -05:00

..

bindings

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-02-23 00:09:14 -05:00

00-INDEX

Documentation/: update 00-INDEX files

2014-02-10 16:01:40 -08:00

booting-without-of.txt

ARM: 8354/1: Documentation: devicetree: root node serial-number property documentation

2015-05-08 10:42:34 +01: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_unittest.txt

Documentation: rename of_selftest.txt to of_unittest.txt

2015-03-25 00:50:53 -05:00

overlay-notes.txt

Documentation: devicetree: Fix double words in Doumentation/devicetree

2015-01-28 15:13:11 -07:00

todo.txt

of: Eliminate of_allnodes list

2014-11-04 13:29:38 +00:00

usage-model.txt

doc: device tree: clarify stuff in usage-model.txt.

2013-06-18 13:46:27 +02:00