From: Matthew Garrett <mjg@redhat.com>
Date: Mon, 1 Mar 2010 14:57:40 +0000 (-0500)
Subject: Merge git://git.iksaif.net/acpi4asus into x86-platform
X-Git-Tag: v2.6.34-rc1~221^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=db38a29111cb9232b1982e583fd417ea9c97357c;p=users%2Fdwmw2%2Flinux.git

Merge git://git.iksaif.net/acpi4asus into x86-platform
---

db38a29111cb9232b1982e583fd417ea9c97357c