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
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
dynamic.c
fdt_address.c
fdt.c
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_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_private.h
of_reserved_mem.c
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
unittest.c	of: unittest: Add option string test case with longer path	2015-03-19 08:39:44 -05:00