]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit3b8df8a305123dcf9f947a7b7781c7e369ef6a22
tree4cd16290c9e1350d946a92ca8d5624cdd683b739
parentafc845b79304d3aba8fddc8fd92ee7294ad80909
parent9aae7e3f7d5485c7195be4123532425be6f8771f
Merge branch 'video' into release

Conflicts:
drivers/acpi/video.c

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