tree dd3894a5b64ba5c761b014f58a51e18940004142
parent 194e3d174043f5ab22649a5cb38a1c05d015750f
parent 63f0edfc0b7f8058f9d3f9b572615ec97ae011ba
author Len Brown <len.brown@intel.com> 1191990551 -0400
committer Len Brown <len.brown@intel.com> 1191990551 -0400

Pull video into release branch

Conflicts:

	drivers/acpi/video.c

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