Pull events into release branch
authorLen Brown <len.brown@intel.com>
Sat, 25 Aug 2007 05:44:01 +0000 (01:44 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 25 Aug 2007 05:44:01 +0000 (01:44 -0400)
Conflicts:

drivers/acpi/video.c

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

Trivial merge