From: Tomi Valkeinen Date: Thu, 29 Nov 2012 08:34:02 +0000 (+0200) Subject: Merge branch 'samsung-fb-next' of git://github.com/jingoo/linux into for-linus X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fa1f94979883aeef231fa023e5b9be971d459952;p=deliverable%2Flinux.git Merge branch 'samsung-fb-next' of git://github.com/jingoo/linux into for-linus Samsung Framebuffer changes for the 3.8 merge window. - The bit definitions of header file are updated. - Some minor typos are fixed. - Some minor bugs of s3c_fb_check_var() are fixed. * 'samsung-fb-next' of git://github.com/jingoo/linux: video: s3c-fb: fix red offset and length for ARGB232 format video: s3c-fb: return an error when bpp is invalid video: s3c-fb: add "drop through" comment video: s3c-fb: use dev_get_drvdata() instead of platform_get_drvdata() video: s3c-fb: use FIMD_V8_VIDTCON0 for EXYNOS5 FIMD video: s3c-fb: fix help message for FB_S3C_DEBUG_REGWRITE video: s3c-fb: fix typo in comment video: s3c-fb: add the bit definitions for VIDCON0_VIDOUT_WB video: s3c-fb: move the bit definitions for DITHMODE register video: s3c-fb: move the bit definitions for WINxMAP and WPALCON register video: s3c-fb: move the bit definitions for VIDINTCON0 register video: s3c-fb: move the address definition for VIDOSD register video: s3c-fb: move the address definitions for VIDTCON registers video: s3c-fb: clean the bit definition for WINCON register --- fa1f94979883aeef231fa023e5b9be971d459952