tree 47799c181a82225e5ee9c566b2186224cde06251
parent e5e54bc86a1fed9849b22fd736c30b23c4719046
parent e5e54bc86a1fed9849b22fd736c30b23c4719046
parent 3c602840528cf1aa835e6e32d76a0a45936b8e4c
author Len Brown <len.brown@intel.com> 1202372284 -0500
committer Len Brown <len.brown@intel.com> 1202372284 -0500

Merge branches 'release' and 'menlo' into release

Conflicts:

	drivers/acpi/video.c

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