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

Conflicts:
	drivers/net/ethernet/mellanox/mlx4/cmd.c
	net/core/fib_rules.c
	net/ipv4/fib_frontend.c

The fib_rules.c and fib_frontend.c conflicts were locking adjustments
in 'net' overlapping addition and removal of code in 'net-next'.

The mlx4 conflict was a bug fix in 'net' happening in the same
place a constant was being replaced with a more suitable macro.

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

2015-04-06 22:34:15 -04:00

..

unittest-data

of: unitest: Add I2C overlay unit tests.

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

address.c

drivers/of: Add empty ranges quirk for PA-Semi

2015-03-27 19:31:16 -07:00

base.c

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

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

device.c

of: rename of_aliases_mutex to just of_mutex

2014-07-07 13:42:52 +01:00

dynamic.c

of/reconfig: Always use the same structure for notifiers

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

fdt_address.c

of/fdt: add FDT address translation support

2014-05-20 15:19:25 -05:00

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_mtd: Add helpers to get ECC strength and ECC step size

2014-03-10 22:42:28 -07:00

of_net.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2014-04-02 20:53:45 -07: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_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: 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: Remove unused variable

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

pdt.c

of: Eliminate of_allnodes list

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

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