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

Simple merge