From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Jun 2012 23:59:05 +0000 (-0700)
Subject: Merge tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6
X-Git-Tag: v3.5-rc3~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=88c144b12a943d35500dbfc141c9b33955d2a88a;p=linux-2.6-block.git

Merge tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6

Pull fbdev fixes from Florian Tobias Schandinat:

 - two fixes for s3c-fb by Jingoo Han (including a fix for a potential
   division by zero)

 - a couple of randconfig fixes by Arnd Bergmann

 - a cleanup for bfin_adv7393fb by Emil Goode

* tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6:
  video: s3c-fb: fix possible division by zero in s3c_fb_calc_pixclk
  video: s3c-fb: clear SHADOWCON register when clearing hardware window registers
  drivers/tosa: driver needs I2C and SPI to compile
  drivers/savagefb: use mdelay instead of udelay
  video/console: automatically select a font
  video/ili9320: do not mark exported functions __devexit
  drivers/video: use correct __devexit_p annotation
  video: bfin_adv7393fb: Convert to kstrtouint_from_user
---

88c144b12a943d35500dbfc141c9b33955d2a88a