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

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

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

2017-06-15 11:59:32 -04:00

..

unittest-data

…

address.c

of: fix sparse warning in of_pci_range_parser_one

2017-05-04 12:58:48 -05:00

base.c

Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

2017-05-05 19:33:07 -07:00

device.c

iommu/of: Ignore all errors except EPROBE_DEFER

2017-05-30 11:31:32 +02:00

dynamic.c

…

fdt_address.c

…

fdt.c

Merge tag 'devicetree-fixes-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

2017-05-19 15:03:24 -07:00

irq.c

of: fix sparse warnings in fdt, irq, reserved mem, and resolver code

2017-05-04 14:01:13 -05:00

Kconfig

…

Makefile

…

of_mdio.c

of_mdio: move of_mdio_parse_addr to header file

2017-06-13 14:00:16 -04:00

of_net.c

…

of_numa.c

…

of_pci_irq.c

…

of_pci.c

…

of_private.h

…

of_reserved_mem.c

Partially Revert "of: fix sparse warnings in fdt, irq, reserved mem, and resolver code"

2017-05-11 10:26:22 -05:00

overlay.c

…

pdt.c

…

platform.c

of/platform: Make of_platform_device_destroy globally visible

2017-05-22 18:01:46 +02:00

resolver.c

of: fix sparse warnings in fdt, irq, reserved mem, and resolver code

2017-05-04 14:01:13 -05:00

unittest.c

…