Merge branch 'wakeup-etc-rafael' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 09:55:46 +0000 (04:55 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 09:55:46 +0000 (04:55 -0500)
commitfb4af417cce9ff87abf33a6bb9a0cf613e285364
tree328ce710c6e6acf7b58145da939fb3cc91d188c9
parent07bf280521bb06bc8e64f0b998fc391253fcb959
parent7b330707dddab1ad772898c1c82516342a551173
Merge branch 'wakeup-etc-rafael' into release
drivers/acpi/scan.c
drivers/acpi/wakeup.c
include/acpi/acpi_bus.h