]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6964e66be537a14be8b0ec9e53e75857d255af8d
tree2e5cd27682614c88ec72009f9605062ada6eae25
parenta4dcddcd1e272abc7d0f859fe2823042b05c34d2
parent564bfc02906671b19b7fd1c8d98e85cb150d57d4
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