Merge branch 'misc-2.6.32' into release
commitd26f0528d588e596955bf296a609afe52eafc099
authorLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:14:45 +0000 (19 02:14 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:14:45 +0000 (19 02:14 -0400)
tree314f7a5637d5517a19f29d64a17e3459505def8f
parentb963bd39c9000328f6ce4f12aa52abbb0c68ee91
parentdf43176c934f2bc01f7615a6e20a4b8e77dcdd11
Merge branch 'misc-2.6.32' into release

Conflicts:
drivers/pci/dmar.c

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/bus.c
drivers/acpi/ec.c
drivers/acpi/pci_slot.c
drivers/acpi/video.c
drivers/pci/dmar.c
drivers/platform/x86/hp-wmi.c
include/linux/acpi.h