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)
commit8e83cd7ca4d2e60b72c92bc9f18ef303a7ce6b6d
tree92edfdfdceb940bafd4d01dd270288a5f2a139a1
parent75435c742bc97373399002d75d71bb1c8f8637bf
parenta44cf75dcb28c0e8ea82db26e43112b4f63d1f8b
Merge branch 'v3.7-for-florian' of git://git./linux/kernel/git/kgene/linux-samsung into fbdev-next
drivers/video/s3c-fb.c