git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7329e93 03ae61d)
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)
Conflicts:
drivers/acpi/video.c

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

Trivial merge
Pandora Kernel Repository