Chris Metcalf d41ca6dfea tilegx pci: fix semantic merge conflict with 3527ed81c ...

Yinghai Lu removed pci_bus.subordinate in pci-next, which meant that
the tile-next changes to add tilegx PCI support don't build.  This
was expected (seen in linux-next) and this one-line fix is along
the same lines as commit b918c62e for all other architectures.

Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>

2012-07-25 18:22:18 -04:00

..

alpha

Merge branch 'pci/myron-pcibios_setup' into next

2012-07-05 15:31:05 -06:00

arm

Merge tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux

2012-07-24 16:40:57 -07:00

avr32

fixups for signal breakage

2012-06-04 17:47:34 -04:00

blackfin

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2012-07-24 10:01:50 -07:00

c6x

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2012-07-24 10:01:50 -07:00

cris

cris/PCI: factor out pcibios_setup()

2012-07-05 15:09:07 -06:00

frv

frv/PCI: move fixup hooks from __init to __devinit

2012-06-12 09:10:55 -06:00

h8300

h8300/uaccess: add mising __clear_user()

2012-07-11 16:04:46 -07:00

hexagon

hexagon: SMP: Remove call to ipi_call_lock()/ipi_call_unlock()

2012-06-05 17:27:11 +02:00

ia64

Merge tag 'iommu-updates-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2012-07-24 16:24:11 -07:00

m32r

Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-07-22 11:22:15 -07:00

m68k

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

2012-07-24 17:20:51 -07:00

microblaze

Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2012-07-24 16:17:07 -07:00

mips

Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2012-07-24 16:17:07 -07:00

mn10300

Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-07-22 11:22:15 -07:00

openrisc

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

parisc

Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2012-07-24 16:17:07 -07:00

powerpc

Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2012-07-24 16:17:07 -07:00

s390

Merge tag 'kvm-3.6-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2012-07-24 12:01:20 -07:00

score

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

sh

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2012-07-24 17:12:54 -07:00

sparc

Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2012-07-24 16:17:07 -07:00

tile

tilegx pci: fix semantic merge conflict with 3527ed81c

2012-07-25 18:22:18 -04:00

um

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-07-19 11:17:30 -07:00

unicore32

Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2012-07-24 16:17:07 -07:00

x86

Merge tag 'iommu-updates-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2012-07-24 16:24:11 -07:00

xtensa

Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2012-07-24 16:17:07 -07:00

.gitignore

…

Kconfig

…