]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf693cc188f67dee6221336a0af93008903506f3d
tree1d5939799cfece8200f832f423fbb7fb57cc54b9
parent9388016e055071b70da6028dcadd249dc8cbb014
parent4c30a848dccd8d3255e273a97cfd64d6743b5415
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>