Merge branches 'release', 'ejd', 'sony' and 'wmi' into release
authorLen Brown <len.brown@intel.com>
Thu, 13 Mar 2008 05:59:52 +0000 (01:59 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 13 Mar 2008 05:59:52 +0000 (01:59 -0400)
1  2  3  4 
drivers/acpi/scan.c
drivers/misc/acer-wmi.c

Simple merge
Simple merge