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
..
acpi	Merge branch 'topic/huang-d3cold-v7' into next	2012-06-23 11:59:43 -06:00
asm-generic	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-06-01 10:34:35 -07:00
crypto
drm	Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-fixes	2012-06-08 09:42:51 +01:00
keys	KEYS: Permit in-place link replacement in keyring list	2012-05-11 10:56:56 +01:00
linux	Merge branch 'pci/bjorn-p2p-bridge-windows' into next	2012-07-10 08:36:09 -06:00
math-emu
media	[media] patch for Asus My Cinema PS3-100 (1043:48cd)	2012-05-20 16:05:02 -03:00
memory
misc
mtd	UBI: amend commentaries WRT dtype	2012-05-20 20:25:59 +03:00
net	cipso: handle CIPSO options correctly when NetLabel is disabled	2012-06-01 14:18:29 -04:00
pcmcia
rdma	Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma', 'qib' and 'raw-qp' into for-linus	2012-05-21 09:00:47 -07:00
rxrpc
scsi	[SCSI] fcoe, bnx2fc, libfcoe: SW FCoE and bnx2fc use FCoE Syfs	2012-05-23 09:43:13 +01:00
sound	ASoC: Last minute updates	2012-05-22 02:58:55 +02:00
target	target: Add MI_REPORT_TARGET_PGS ext. header + implict_trans_secs attribute	2012-05-17 00:45:58 -07:00
trace	mm: vmscan: remove reclaim_mode_t	2012-05-29 16:22:19 -07:00
video	fbdev updates for 3.5	2012-06-01 16:57:51 -07:00
xen	xen: do not map the same GSI twice in PVHVM guests.	2012-05-21 14:11:36 -04:00
Kbuild