Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux
authorPaul Mundt <lethal@linux-sh.org>
Tue, 24 May 2011 06:35:54 +0000 (15:35 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 24 May 2011 06:35:54 +0000 (15:35 +0900)
commita6b5825aa703714523a745a8e050b9d6105f6704
tree1d5939799cfece8200f832f423fbb7fb57cc54b9
parent9fb4c7fbbcb1e947567d13b82e429ae47a46e337
parent0d66cbb53eca4ab3db85d9189d5a85c9fac49b84
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>