]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'acpi-modparam' into release
authorLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:45:50 +0000 (01:45 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:45:50 +0000 (01:45 -0400)
commit3142fb3b579ba92e0d77ebdc0f48389bc3ecf4cc
tree4fc645c52ad9eebcdf59a6ab32d534df121dd280
parente66b1b523660be21844e317759b01b6f48a42e54
parentbaec50799a16d29a98795306ae578483ef979643
Merge branch 'acpi-modparam' into release

Conflicts:
drivers/acpi/Makefile

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/Makefile
drivers/acpi/debug.c
drivers/acpi/power.c
drivers/acpi/system.c