tree c7244cd1d4af8d99c861b21ebcaeabf23e355b9f
parent 9b5a56ddfd615a27e3a0856ceae1592a24021e42
parent 2dba1b5d87e08a294da5cdfa4d32908000e9b085
author Len Brown <len.brown@intel.com> 1226456150 -0500
committer Len Brown <len.brown@intel.com> 1226456150 -0500

Merge branch 'video' into release

Conflicts:
	Documentation/kernel-parameters.txt

Signed-off-by: Len Brown <len.brown@intel.com>