kernel_optimize_test/drivers/of
David S. Miller 739e4a758e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/r8152.c
	net/netfilter/nfnetlink.c

Both r8152 and nfnetlink conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-10-02 11:25:43 -07:00
..
testcase-data Merge branch 'devicetree/next-overlay' into devicetree/next 2014-08-11 14:06:23 +01:00
address.c of: Provide a function to request and map memory 2014-07-23 12:02:30 +02:00
base.c of: make sure of_alias is initialized before accessing it 2014-09-08 15:57:26 +01:00
device.c of: rename of_aliases_mutex to just of_mutex 2014-07-07 13:42:52 +01:00
dynamic.c of: Disabling OF functions that use sysfs if CONFIG_SYSFS disabled 2014-09-08 15:57:25 +01:00
fdt_address.c of/fdt: add FDT address translation support 2014-05-20 15:19:25 -05:00
fdt.c of/fdt: fix memory range check 2014-09-25 11:55:50 +01:00
irq.c of/irq: Fix lookup to use 'interrupts-extended' property first 2014-08-16 09:03:58 +01:00
Kconfig of: Fixing OF Selftest build error 2014-08-03 12:21:28 -06:00
Makefile Merge branch 'devicetree/next-overlay' into devicetree/next 2014-08-11 14:06:23 +01:00
of_mdio.c of: mdio: honor flags passed to of_phy_connect 2014-09-19 16:27:07 -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: implement pci_address_to_pio as weak function 2013-10-09 20:04:06 -05:00
of_private.h of: Transactional DT support. 2014-07-23 17:29:15 -06:00
of_reserved_mem.c drivers: of: add automated assignment of reserved regions to client devices 2014-08-01 12:22:21 -06:00
pdt.c of: device_node kobject lifecycle fixes 2014-03-19 14:58:40 +00:00
platform.c of/platform: Fix of_platform_device_destroy iteration of devices 2014-07-07 13:33:46 +01:00
selftest.c Enabling OF selftest to run without machine's devicetree 2014-08-16 09:03:56 +01:00