Merge branch 'bjorn-notify' into release
authorLen Brown <len.brown@intel.com>
Wed, 24 Jun 2009 05:22:20 +0000 (01:22 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 24 Jun 2009 05:22:20 +0000 (01:22 -0400)
commit57599cc997b81a7c4f764693a7316886a72067fe
tree2e5cd27682614c88ec72009f9605062ada6eae25
parentfbe8cddd2d85979d273d7937a2b8a47498694d91
parent586caae36cece718ff46b3a59b88af79e9f7a2e0
Merge branch 'bjorn-notify' into release

Conflicts:
drivers/platform/x86/eeepc-laptop.c

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/platform/x86/eeepc-laptop.c
include/acpi/acpi_bus.h