Merge branch 'misc' into test
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 17:16:14 +0000 (12:16 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 17:16:14 +0000 (12:16 -0500)
commiteab001bf88f68653e87a7d90124a2241131dbeda
treef3b93ec36c4fe09a7f49a27b76add630f6ec76f0
parent156d821270e131dee7d89fc4aa385f0f9b1900ea
parent106d1a0ab2a354b97df3e232be7dedbfaf8e901d
Merge branch 'misc' into test
drivers/acpi/osl.c