Bjorn Helgaas 6ee53f4c38 Merge branch 'pci/bjorn-p2p-bridge-windows' into next ...

* pci/bjorn-p2p-bridge-windows:
  sparc/PCI: replace pci_cfg_fake_ranges() with pci_read_bridge_bases()
  PCI: support sizing P2P bridge I/O windows with 1K granularity
  PCI: reimplement P2P bridge 1K I/O windows (Intel P64H2)
  PCI: allow P2P bridge windows starting at PCI bus address zero

Conflicts:
	drivers/pci/probe.c
	include/linux/pci.h

2012-07-10 08:36:09 -06:00

..

alpha

Merge branch 'pci/myron-pcibios_setup' into next

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

arm

Merge branch 'topic/sebastian-devinit-fixups' into next

2012-06-18 12:14:10 -06:00

avr32

fixups for signal breakage

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

blackfin

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

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

c6x

new helper: signal_delivered()

2012-06-01 12:58:52 -04: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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-06-01 11:53:44 -07:00

hexagon

new helper: signal_delivered()

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

ia64

Merge branch 'pci/myron-pcibios_setup' into next

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

m32r

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-06-01 11:53:44 -07:00

m68k

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-06-01 11:53:44 -07:00

microblaze

Merge branch 'pci/myron-pcibios_setup' into next

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

mips

Merge branch 'pci/myron-final-fixups-v2' into next

2012-07-09 20:56:54 -06:00

mn10300

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-06-01 11:53:44 -07:00

openrisc

new helper: signal_delivered()

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

parisc

parisc/PCI: factor out pcibios_setup()

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

powerpc

Merge branch 'pci/myron-pcibios_setup' into next

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

s390

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-06-01 11:53:44 -07:00

score

new helper: signal_delivered()

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

sh

Merge branch 'pci/myron-pcibios_setup' into next

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

sparc

Merge branch 'pci/bjorn-p2p-bridge-windows' into next

2012-07-10 08:36:09 -06:00

tile

Merge branch 'pci/myron-pcibios_setup' into next

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

um

new helper: signal_delivered()

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

unicore32

unicore32/PCI: adjust section annotations for pcibios_setup()

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

x86

x86/PCI: move final fixups from __init to __devinit

2012-07-09 20:56:45 -06:00

xtensa

Merge branch 'pci/myron-pcibios_setup' into next

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

.gitignore

…

Kconfig

Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-05-25 09:18:59 -07:00