OpenCloudOS-Kernel/Documentation/devicetree
David S. Miller 36583eb54d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/cadence/macb.c
	drivers/net/phy/phy.c
	include/linux/skbuff.h
	net/ipv4/tcp.c
	net/switchdev/switchdev.c

Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD}
renaming overlapping with net-next changes of various
sorts.

phy.c was a case of two changes, one adding a local
variable to a function whilst the second was removing
one.

tcp.c overlapped a deadlock fix with the addition of new tcp_info
statistic values.

macb.c involved the addition of two zyncq device entries.

skbuff.h involved adding back ipv4_daddr to nf_bridge_info
whilst net-next changes put two other existing members of
that struct into a union.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-23 01:22:35 -04:00
..
bindings Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-05-23 01:22:35 -04:00
00-INDEX
booting-without-of.txt MIPS: BMIPS: Document the firmware->kernel DTB interface 2015-04-01 17:21:38 +02: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