Merge branch 'misc' into test
authorLen Brown <[email protected]>
Wed, 12 Jan 2011 17:16:14 +0000 (12:16 -0500)
committerLen Brown <[email protected]>
Wed, 12 Jan 2011 17:16:14 +0000 (12:16 -0500)
1  2 
drivers/acpi/osl.c

Simple merge