Merge git://git.iksaif.net/acpi4asus into x86-platform
authorMatthew Garrett <mjg@redhat.com>
Mon, 1 Mar 2010 14:57:40 +0000 (09:57 -0500)
committerMatthew Garrett <mjg@redhat.com>
Mon, 1 Mar 2010 14:57:40 +0000 (09:57 -0500)
commitdb38a29111cb9232b1982e583fd417ea9c97357c
tree0ed373f0093432c88e2a082c6d757905a04381a6
parentb466301b842f3a54e219b5cc587f22233ecb1345
parentb1a96e3606b6efc3a6e9c8559ec6660e515b01a7
Merge git://git.iksaif.net/acpi4asus into x86-platform
drivers/platform/x86/Kconfig