Merge branch 'video' into release
authorLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:40:06 +0000 (01:40 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:40:06 +0000 (01:40 -0400)
commit12648810506eaa063dc23b66514fbb4796f34312
tree4cd16290c9e1350d946a92ca8d5624cdd683b739
parent7329e9356e5b46e11a1781dff2dc64c2e3284884
parent03ae61dd5701092aabb60a8cae9929dbf8dc25c6
Merge branch 'video' into release

Conflicts:
drivers/acpi/video.c

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/video.c