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
..
boot	sparc32: drop build time btfixup patching	2012-05-14 14:05:10 -07:00
configs	perf: Remove PERF_COUNTERS config option	2012-04-26 13:52:52 +02:00
include/asm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-06-01 11:53:44 -07:00
kernel	Merge branch 'pci/bjorn-p2p-bridge-windows' into next	2012-07-10 08:36:09 -06:00
lib	sparc: use the new generic strnlen_user() function	2012-05-26 11:33:54 -07:00
math-emu	sparc64: Fix several bugs in quad floating point emulation.	2012-05-25 00:31:56 -07:00
mm	sparc32: srmmu_probe now knows about leon too	2012-05-27 23:52:51 -07:00
net	net: filter: remove unused cpu_off in sparc JIT	2012-04-17 22:55:59 -04:00
oprofile	sparc: using HZ needs an include of linux/param.h	2009-10-05 00:46:08 -07:00
prom	sparc32: drop sun4c support	2012-05-11 19:27:44 -07:00
Kbuild	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next	2012-05-21 10:32:01 -07:00
Kconfig	sparc: fix bad merge of sparc Kconfig	2012-05-27 21:16:14 -07:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Makefile	Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-05-21 19:43:57 -07:00