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)

Trivial merge