]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pci/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 02:00:48 +0000 (12:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 02:00:48 +0000 (12:00 +1000)
commit70401b0bc3a7d9fdfe166ecb9175f33201a69b9d
tree39d976ab2a877bb94f91df059e1cc163f21e21c7
parenta214ff7bb65add4ef7c75d096dc47358ac07a094
parentdf58f46c0f2a1d69268b734ac25c87ffb7aeb32a
Merge remote-tracking branch 'pci/next'

Conflicts:
drivers/acpi/pci_root.c
drivers/pci/probe.c
include/linux/aer.h
drivers/acpi/apei/ghes.c
drivers/acpi/pci_root.c
drivers/ata/ahci.c
drivers/i2c/busses/Kconfig
drivers/pci/pcie/aer/aerdrv_core.c
include/acpi/acpi_bus.h
include/linux/aer.h