Merge branch 'linus' into release
authorLen Brown <len.brown@intel.com>
Wed, 23 Mar 2011 06:34:54 +0000 (02:34 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 23 Mar 2011 06:34:54 +0000 (02:34 -0400)
commit02e2407858fd62053bf60349c0e72cd1c7a4a60e
tree0ebdbddc97d3abbc675916010e7771065b70c137
parent96e1c408ea8a556c5b51e0e7d56bd2afbfbf5fe9
parent6447f55da90b77faec1697d499ed7986bb4f6de6
Merge branch 'linus' into release

Conflicts:
arch/x86/kernel/acpi/sleep.c

Signed-off-by: Len Brown <len.brown@intel.com>
Documentation/feature-removal-schedule.txt
arch/x86/include/asm/acpi.h
arch/x86/kernel/acpi/sleep.c
arch/x86/kernel/acpi/sleep.h
drivers/acpi/apei/Kconfig
drivers/acpi/apei/erst.c
drivers/acpi/osl.c
drivers/acpi/sleep.c
include/acpi/acpi_bus.h