linux/drivers/of
David S. Miller 5510b3c2a1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	arch/s390/net/bpf_jit_comp.c
	drivers/net/ethernet/ti/netcp_ethss.c
	net/bridge/br_multicast.c
	net/ipv4/ip_fragment.c

All four conflicts were cases of simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-07-31 23:52:20 -07:00
..
unittest-data of/unittest: replace 'selftest' with 'unittest' 2015-03-25 00:53:29 -05:00
Kconfig of: add HAS_IOMEM depends to OF_ADDRESS 2015-07-27 08:21:04 -05:00
Makefile of: clean-up unnecessary libfdt include paths 2015-06-04 20:16:47 -05:00
address.c Devicetree changes for v4.2 2015-07-01 19:40:18 -07:00
base.c Devicetree changes for v4.2 2015-07-01 19:40:18 -07:00
device.c of: add helper function to retrive match data 2015-05-28 12:59:40 -05:00
dynamic.c of/dynamic: Fix test for PPC_PSERIES 2015-06-05 10:39:28 +09:00
fdt.c Devicetree changes for v4.2 2015-07-01 19:40:18 -07:00
fdt_address.c of/fdt: add FDT address translation support 2014-05-20 15:19:25 -05:00
irq.c of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh 2015-06-30 17:03:57 +01:00
of_mdio.c of_mdio: add new DT property 'managed' to specify the PHY management type 2015-07-21 16:12:55 -07:00
of_mtd.c of_mtd: Add helpers to get ECC strength and ECC step size 2014-03-10 22:42:28 -07:00
of_net.c of_net: factor out repetitive code from of_get_mac_address() 2015-03-29 08:56:17 +01:00
of_pci.c of/pci: Add of_pci_dma_configure() to update DMA configuration 2015-03-03 14:42:57 -06:00
of_pci_irq.c of_pci_irq: kill useless variable in of_irq_parse_pci() 2014-05-27 12:13:34 +01:00
of_private.h of: Refactor __of_node_alloc() into __of_node_dup() 2014-11-24 22:24:41 +00:00
of_reserved_mem.c drivers: of: Export of_reserved_mem_device_{init,release} 2015-01-13 13:56:58 -06:00
overlay.c of/overlay: Grammar s/an negative/a negative/ 2015-05-28 13:00:25 -05:00
pdt.c of: Eliminate of_allnodes list 2014-11-04 13:29:38 +00:00
platform.c MFD/OF: document MFD devices and handle simple-mfd 2015-05-11 08:55:03 +02:00
resolver.c of/resolver: Switch to new local fixups format. 2014-11-24 22:24:50 +00:00
unittest.c of: Drop owner assignment from platform and i2c driver 2015-07-27 08:24:39 -05:00