android_kernel_msm-6.1_noth.../Documentation/devicetree
David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	arch/arm/boot/dts/imx6sx-sdb.dts
	net/sched/cls_bpf.c

Two simple sets of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 16:59:56 -08:00
..
bindings Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-01-27 16:59:56 -08:00
00-INDEX
booting-without-of.txt
changesets.txt
dynamic-resolution-notes.txt
of_selftest.txt of: Eliminate of_allnodes list 2014-11-04 13:29:38 +00:00
overlay-notes.txt of/overlay: Introduce DT overlay support 2014-11-24 22:25:10 +00:00
todo.txt of: Eliminate of_allnodes list 2014-11-04 13:29:38 +00:00
usage-model.txt