Skip to content

Commit

Permalink
Merge branch 'video' into release
Browse files Browse the repository at this point in the history
Conflicts:
	drivers/acpi/video.c

Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Len Brown committed Apr 5, 2009
2 parents 7329e93 + 03ae61d commit 1264881
Show file tree
Hide file tree
Showing 7 changed files with 306 additions and 63 deletions.
Loading

0 comments on commit 1264881

Please sign in to comment.