Bjorn Helgaas 414ae7609e Merge branch 'pci/resource' into next ... * pci/resource: PCI: tegra: Remove PCI_REASSIGN_ALL_BUS use on Tegra resource: Set type when reserving new regions resource: Set type of "reserve=" user-specified resources irqchip/i8259: Set I/O port resource types correctly powerpc: Set I/O port resource types correctly MIPS: Set I/O port resource types correctly vgacon: Set VGA struct resource types PCI: Use dev_info() rather than dev_err() for ROM validation PCI: Remove PCI_REASSIGN_ALL_RSRC use on arm and arm64 PCI: Remove sysfs resource mmap warning Conflicts: drivers/pci/rom.c		2018-01-31 10:12:56 -06:00
..
boot	powerpc updates for 4.15	2017-11-16 12:47:46 -08:00
configs	powerpc/configs: Enable I2C_CHARDEV for pseries and powernv	2017-10-22 12:08:31 +02:00
crypto	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-08 13:32:44 -08:00
kernel	Merge branch 'pci/misc' into next	2018-01-31 10:10:32 -06:00
kvm	* x86 bugfixes: APIC, nested virtualization, IOAPIC	2017-11-30 08:15:19 -08:00
lib	powerpc fixes for 4.15 #2	2017-11-24 19:40:12 -10:00
math-emu	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mm	powerpc fixes for 4.15 #3	2017-12-01 08:40:17 -05:00
net	powerpc updates for 4.15	2017-11-16 12:47:46 -08:00
oprofile	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
perf	powerpc/perf: Fix oops when grouping different pmu events	2017-12-04 16:03:19 +11:00
platforms	Merge branch 'pci/resource' into next	2018-01-31 10:12:56 -06:00
purgatory	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
sysdev	Merge branch 'pci/resource' into next	2018-01-31 10:12:56 -06:00
tools	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
xmon	powerpc/xmon: Don't print hashed pointers in xmon	2017-12-07 00:27:01 +11:00
Kconfig	powerpc updates for 4.15	2017-11-16 12:47:46 -08:00
Kconfig.debug	powerpc updates for 4.15	2017-11-16 12:47:46 -08:00
Makefile	Merge branch 'fixes' into next	2017-08-23 22:20:10 +10:00
Makefile.postlink	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00