Merge branch 'acpi-video' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:02:10 +0000 (05:02 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:02:10 +0000 (05:02 -0500)
1  2 
Documentation/kernel-parameters.txt

Simple merge