commit | a58db59a263d4232710af816f3857254b5823633 | [log] [tgz] |
---|---|---|
author | Matthew Garrett <mjg@redhat.com> | Tue Mar 02 09:51:48 2010 -0500 |
committer | Matthew Garrett <mjg@redhat.com> | Tue Mar 02 09:51:48 2010 -0500 |
tree | 977120471e3d34412d2c810c48d0fe2b9547ffc7 | |
parent | 881a6c25a8453388e3190de94a5e105439a9f806 [diff] | |
parent | 88cc83772a3c7756b9f2b4ba835545ad90a08409 [diff] |
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