]> Git Repo - linux.git/commitdiff
Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux
authorPaul Mundt <[email protected]>
Tue, 24 May 2011 06:35:54 +0000 (15:35 +0900)
committerPaul Mundt <[email protected]>
Tue, 24 May 2011 06:35:54 +0000 (15:35 +0900)
Conflicts:
drivers/video/omap2/dss/dsi.c
drivers/video/omap2/dss/dss_features.c
drivers/video/omap2/dss/dss_features.h

Signed-off-by: Paul Mundt <[email protected]>

Trivial merge
This page took 0.057595 seconds and 4 git commands to generate.