tree 9c9fcd733a04d8c147e9d01f44911c359e1543bf
parent a1e66dd0515c8cfa72b8e2a3834d59548cf84ba5
parent 7d9745cf239ca98cf1f694bff4765a276b05ee68
author Matthew Garrett <mjg@redhat.com> 1274361869 -0400
committer Matthew Garrett <mjg@redhat.com> 1274361869 -0400

Merge branch 'for-upstream/platform-x86_tpacpi' of git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6 into x86-platform