Merge branch 'v3.7-for-florian' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Thu, 20 Sep 2012 13:57:47 +0000 (13:57 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Thu, 20 Sep 2012 13:57:47 +0000 (13:57 +0000)
1  2 
drivers/video/s3c-fb.c

Simple merge