| commit | a6b5825aa703714523a745a8e050b9d6105f6704 | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Tue May 24 15:35:54 2011 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Tue May 24 15:35:54 2011 +0900 |
| tree | 1d5939799cfece8200f832f423fbb7fb57cc54b9 | |
| parent | 9fb4c7fbbcb1e947567d13b82e429ae47a46e337 [diff] | |
| parent | 0d66cbb53eca4ab3db85d9189d5a85c9fac49b84 [diff] |
Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux 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 <lethal@linux-sh.org>