linux/drivers/of
David S. Miller 1e8d6421cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/bonding/bond_3ad.h
	drivers/net/bonding/bond_main.c

Two minor conflicts in bonding, both of which were overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-19 01:24:22 -05:00
..
Kconfig
Makefile
address.c of: fix PCI bus match for PCIe slots 2014-02-05 09:59:20 -06:00
base.c of: search the best compatible match first in __of_match_node() 2014-02-15 18:51:17 -06:00
device.c
fdt.c
irq.c
of_mdio.c of_mdio: fix phy interrupt passing 2014-02-18 18:12:53 -05:00
of_mtd.c
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_pci_irq.c
of_private.h
pdt.c
platform.c
selftest.c