Rafael J. Wysocki 5c493df25a Merge branch 'pci/host-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci into acpi-resources ...

modified:   drivers/of/of_pci.c

This fixes a build failure after merging the 'acpi-resources' branch
with the PCI tree caused by bad interactions between that branch and
the only commit in 'pci/host-generic'.  Also that commit contains a
bug which can be fixed by removing one line of code, so do that too.

Link: http://marc.info/?l=linux-kernel&m=142344882101429&w=2
Link: http://marc.info/?l=linux-next&m=142346304003932&w=2
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

2015-02-09 23:32:19 +01:00

..

unittest-data

of/unittest: Overlays with sub-devices tests

2015-01-23 13:10:07 +00:00

address.c

Merge tag 'v3.18-rc6' into devicetree/next

2014-11-24 14:50:07 +00:00

base.c

Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux

2014-12-11 13:06:58 -08: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

Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux

2014-12-11 13:06:58 -08:00

irq.c

of/irq: Export of_irq_get()

2014-11-10 09:34:57 +01:00

Kconfig

of: remove select of non-existant OF_DEVICE config symbol

2014-11-26 15:19:43 +00:00

Makefile

of/overlay: Introduce DT overlay support

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

of_mdio.c

net: phy: adjust fixed_phy_register() return value

2014-10-07 13:06:45 -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

Merge branch 'pci/host-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci into acpi-resources

2015-02-09 23:32:19 +01: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: add return value to of_reserved_mem_device_init()

2014-10-29 16:33:14 -07:00

overlay.c

of/overlay: Do not generate duplicate nodes

2015-01-22 15:36:48 +00:00

pdt.c

of: Eliminate of_allnodes list

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

platform.c

of/platform: Handle of_populate drivers in notifier

2015-01-22 15:36:55 +00:00

resolver.c

of/resolver: Switch to new local fixups format.

2014-11-24 22:24:50 +00:00

unittest.c

of/unittest: Overlays with sub-devices tests

2015-01-23 13:10:07 +00:00