Merge branch 'bugzilla-21212' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:09:35 +0000 (05:09 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:09:35 +0000 (05:09 -0500)
1  2 
drivers/acpi/video.c

Simple merge