Merge branch 'for-upstream/platform-x86_tpacpi' of git://repo.or.cz/linux-2.6/linux...
authorMatthew Garrett <mjg@redhat.com>
Tue, 2 Mar 2010 14:51:48 +0000 (09:51 -0500)
committerMatthew Garrett <mjg@redhat.com>
Tue, 2 Mar 2010 14:51:48 +0000 (09:51 -0500)
commita58db59a263d4232710af816f3857254b5823633
tree977120471e3d34412d2c810c48d0fe2b9547ffc7
parent881a6c25a8453388e3190de94a5e105439a9f806
parent88cc83772a3c7756b9f2b4ba835545ad90a08409
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
drivers/platform/x86/Kconfig