]> git.proxmox.com Git - mirror_ubuntu-kernels.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)
commitd0302bc62af7983040ea1cd1b5dd2b36e1a6a509
treeef45618ae057e21fff7c82190939fe5f4466cf06
parent106ad8d6b0a7c1a597fab56ec692c39f553fabbc
parent237889bf0a62f1399fb2ba0c2a259e6a96597131
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