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

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

include

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

kernel

Merge branch 'pci/resource' into next

2018-01-31 10:12:56 -06:00

lib

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01: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

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

oprofile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

defconfig

alpha: defconfig: Cleanup from old Kconfig options

2017-09-04 12:04:33 -07:00

Kconfig

Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2017-11-15 10:14:11 -08:00

Kconfig.debug

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

Makefile

alpha: makefile: don't enforce small data model for kernel builds

2013-04-07 12:59:30 -07:00