Bjorn Helgaas 8cd9385034 Merge branch 'pci/resource' into next ...

* pci/resource:
  PCI: Work around poweroff & suspend-to-RAM issue on Macbook Pro 11
  PCI: Do not disregard parent resources starting at 0x0

Conflicts:
arch/x86/pci/fixup.c

2017-07-02 18:49:49 -05:00

..

alpha

Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2017-05-10 20:45:36 -07:00

arc

Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2017-05-10 20:45:36 -07:00

arm

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

2017-05-11 11:27:54 -07:00

arm64

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

2017-05-11 11:27:54 -07:00

blackfin

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

c6x

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

cris

Merge tag 'for-linus-20170510' of git://git.infradead.org/linux-mtd

2017-05-11 10:44:22 -07:00

frv

Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2017-05-10 20:45:36 -07:00

h8300

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

hexagon

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

ia64

Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2017-05-10 20:45:36 -07:00

m32r

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

m68k

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

metag

Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2017-05-10 20:45:36 -07:00

microblaze

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

mips

MIPS: PCI: Remove unused busn_offset

2017-05-18 15:39:19 -05:00

mn10300

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

nios2

Merge tag 'nios2-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2

2017-05-12 09:53:16 -07:00

openrisc

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

parisc

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

powerpc

Merge tag 'powerpc-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2017-05-12 10:04:09 -07:00

s390

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

score

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

sh

Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2017-05-10 20:45:36 -07:00

sparc

Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2017-05-10 20:45:36 -07:00

tile

arch/include: remove empty Kbuild files

2017-05-11 00:22:18 +09:00

um

Merge branch 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

2017-05-13 10:20:02 -07:00

unicore32

Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2017-05-10 20:45:36 -07:00

x86

Merge branch 'pci/resource' into next

2017-07-02 18:49:49 -05:00

xtensa

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

.gitignore

…

Kconfig

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

2017-05-10 10:30:46 -07:00