0e261
parent 871043bc463e7d191e7b5b00436a8852921dd833
author Len Brown <len.brown@intel.com> 1245820790 -0400
committer Len Brown <len.brown@intel.com> 1245820790 -0400

Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release
Õc€×ž0x