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

Conflicts:
	net/netfilter/nf_tables_core.c

The nf_tables_core.c conflict was resolved using a conflict resolution
from Stephen Rothwell as a guide.

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

2015-03-23 22:22:43 -04:00

..

unittest-data

of: unitest: Add I2C overlay unit tests.

2015-02-04 10:43:14 -06:00

address.c

…

base.c

Revert "of: Fix premature bootconsole disable with 'stdout-path'"

2015-03-19 08:46:54 -05:00

device.c

…

dynamic.c

of/reconfig: Always use the same structure for notifiers

2014-11-24 22:25:03 +00:00

fdt_address.c

…

fdt.c

of/fdt: fix sparse warning

2015-02-04 10:43:15 -06:00

irq.c

of/irq: Fix of_irq_parse_one() returned error codes

2015-03-19 08:39:14 -05:00

Kconfig

of: Drop superfluous dependance for OF_OVERLAY

2015-03-02 08:07:44 -06:00

Makefile

of/overlay: Introduce DT overlay support

2014-11-24 22:25:10 +00:00

of_mdio.c

of: mdio: export of_mdio_parse_addr

2015-03-11 17:56:28 -04:00

of_mtd.c

…

of_net.c

…

of_pci_irq.c

…

of_pci.c

of/pci: Remove duplicate kfree in of_pci_get_host_bridge_resources()

2015-02-11 15:27:15 -06:00

of_private.h

…

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: Remove unused variable

2015-03-10 10:34:33 -05:00

pdt.c

…

platform.c

ARM: SoC driver updates

2015-02-17 09:38:59 -08:00

resolver.c

of/resolver: Switch to new local fixups format.

2014-11-24 22:24:50 +00:00

unittest.c

of: unittest: Add option string test case with longer path

2015-03-19 08:39:44 -05:00