]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 01:55:18 +0000 (12:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 01:55:18 +0000 (12:55 +1100)
commit083ee11b034aab59d0ce5aebfc6d22e401d5b81a
treec04c7f275e2980da5d8729622f4457ce70055a60
parent9354f0e6a7de956cfa3d1fb249110566e4c4c9d0
parent10baf04e95fbf7eb6089410220a547211dd2ffa7
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
drivers/acpi/internal.h
drivers/acpi/scan.c
drivers/pci/hotplug/acpiphp_glue.c
drivers/pci/pci-acpi.c
19 files changed:
Documentation/kernel-parameters.txt
arch/arm64/kernel/process.c
arch/microblaze/kernel/process.c
arch/x86/Kconfig
drivers/Makefile
drivers/acpi/Kconfig
drivers/acpi/custom_method.c
drivers/acpi/internal.h
drivers/acpi/osl.c
drivers/acpi/pci_root.c
drivers/acpi/pci_slot.c
drivers/acpi/scan.c
drivers/ata/libata-acpi.c
drivers/pci/hotplug/acpiphp_glue.c
drivers/pci/hotplug/sgi_hotplug.c
drivers/pci/pci-acpi.c
drivers/platform/x86/eeepc-laptop.c
include/acpi/acpi_bus.h
include/acpi/acpiosxf.h