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

of: Add unit tests for applying overlays

2017-04-27 17:26:06 -05:00

address.c

of: fix sparse warning in of_pci_range_parser_one

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

base.c

DeviceTree for 4.12:

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

of: use pr_fmt prefix for all console printing

2016-07-18 16:57:42 -05:00

fdt_address.c

of: use pr_fmt prefix for all console printing

2016-07-18 16:57:42 -05:00

fdt.c

DeviceTree fixes for 4.12-rc:

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

mtd: Kill the OF_MTD Kconfig option

2016-09-23 09:35:16 +02:00

Makefile

MTD updates for v4.7:

2016-05-24 11:00:20 -07:00

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_net: factor out repetitive code from of_get_mac_address()

2015-03-29 08:56:17 +01:00

of_numa.c

of: fix "/cpus" reference leak in of_numa_parse_cpu_nodes()

2017-04-18 11:04:12 -05:00

of_pci_irq.c

of/irq: improve error report on irq discovery process failure

2017-01-09 09:52:17 -06:00

of_pci.c

of/pci: Remove unused MSI controller helpers

2017-03-14 15:10:11 -05:00

of_private.h

of: fix unittest build without CONFIG_OF_OVERLAY

2017-04-28 16:17:56 -05:00

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

of: remove redundant memset in overlay

2017-01-09 14:21:23 -06:00

pdt.c

of: Eliminate of_allnodes list

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

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

of/unittest: Missing unlocks on error

2017-05-04 11:07:38 -05:00