David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-05 20:32:02 -05:00
..
testcase-data	of: Add self test for of_match_node()	2014-02-20 11:52:09 +00:00
Kconfig	of/Kconfig: Spelling s/one/once/	2013-12-30 10:23:25 -06:00
Makefile	Revert "drivers: of: add initialization code for dma reserved memory"	2013-10-15 09:26:07 +01:00
address.c	of: fix PCI bus match for PCIe slots	2014-02-05 09:59:20 -06:00
base.c	of: reimplement the matching method for __of_match_node()	2014-02-20 11:50:58 +00:00
device.c	platform: introduce OF style 'modalias' support for platform bus	2014-01-17 01:59:15 +01:00
fdt.c	of: Fix NULL dereference in unflatten_and_copy()	2013-12-11 13:40:30 +00:00
irq.c	Merge remote-tracking branch 'grant/devicetree/next' into for-3.14	2014-01-17 16:01:27 -06:00
of_mdio.c	of_mdio: fix phy interrupt passing	2014-02-18 18:12:53 -05:00
of_mtd.c	of: mtd: nuke useless const qualifier	2012-07-10 10:32:06 -05:00
of_net.c	net: phy: re-design phy_modes to be self-contained	2014-02-12 19:08:20 -05:00
of_pci.c	of: implement pci_address_to_pio as weak function	2013-10-09 20:04:06 -05:00
of_pci_irq.c	Merge remote-tracking branch 'grant/devicetree/next' into for-next	2013-11-07 10:34:46 -06:00
of_private.h	of: Output devicetree alias names in uevent	2013-02-06 11:06:35 +00:00
pdt.c	of: remove unnecessary prom.h includes	2013-10-09 20:03:59 -05:00
platform.c	Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 07:55:21 +09:00
selftest.c	of: Add self test for of_match_node()	2014-02-20 11:52:09 +00:00