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)
1  2 
drivers/platform/x86/Kconfig

Simple merge