Merge branch 'linus' into release
authorLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 04:06:59 +0000 (00:06 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 04:06:59 +0000 (00:06 -0400)
1  2 
drivers/acpi/scan.c
drivers/acpi/sleep.c

Simple merge
Simple merge