]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
Merge branch 'common/fbdev-meram' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorPaul Mundt <lethal@linux-sh.org>
Wed, 25 May 2011 06:01:25 +0000 (15:01 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 25 May 2011 06:01:25 +0000 (15:01 +0900)
1  2 
drivers/video/sh_mobile_lcdcfb.c

Simple merge