]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'misc' into release
authorLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:37:48 +0000 (03:37 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:37:48 +0000 (03:37 -0500)
commitf2b08b29ce508a38bc9a7af63e914548c7707a77
treeef45618ae057e21fff7c82190939fe5f4466cf06
parent38b8799ba1b790c758ca18c1de15af2f0e16b0be
parentce6f48d838646451d2d2f5002b09b78780dda578
Merge branch 'misc' into release

Conflicts:
include/acpi/acpixf.h

Signed-off-by: Len Brown <len.brown@intel.com>
arch/x86/kernel/acpi/boot.c
drivers/acpi/acpica/tbutils.c
drivers/acpi/pci_link.c
drivers/acpi/video.c
include/acpi/acpixf.h