tree 977120471e3d34412d2c810c48d0fe2b9547ffc7
parent 881a6c25a8453388e3190de94a5e105439a9f806
parent 88cc83772a3c7756b9f2b4ba835545ad90a08409
author Matthew Garrett <mjg@redhat.com> 1267541508 -0500
committer Matthew Garrett <mjg@redhat.com> 1267541508 -0500

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