Merge branch 'thinkpad' into test
authorLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:28:48 +0000 (23:28 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:28:48 +0000 (23:28 -0400)
1  2 
drivers/misc/thinkpad_acpi.c

Simple merge