Merge branch 'for-upstream/platform-x86_tpacpi' of git://repo.or.cz/linux-2.6/linux...
authorMatthew Garrett <mjg@redhat.com>
Thu, 20 May 2010 13:24:29 +0000 (09:24 -0400)
committerMatthew Garrett <mjg@redhat.com>
Thu, 20 May 2010 13:24:29 +0000 (09:24 -0400)
commit420f5f0c5aeb3ff47cf220e7b256f8fec327659c
tree9c9fcd733a04d8c147e9d01f44911c359e1543bf
parenta1e66dd0515c8cfa72b8e2a3834d59548cf84ba5
parent7d9745cf239ca98cf1f694bff4765a276b05ee68
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