From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Jan 2011 23:01:22 +0000 (+1000)
Subject: Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.38-rc3~57
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9948d378b99b06f6f34164dd8ff827e228ae9251;p=~emulex%2Finfiniband.git

Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6

* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
  mailmap: Add an entry for Axel Lin.
  video: fix some comments in drivers/video/console/vgacon.c
  drivers/video/bf537-lq035.c: Add missing IS_ERR test
  video: pxa168fb: remove a redundant pxa168fb_check_var call
  video: da8xx-fb: fix fb_probe error path
  video: pxa3xx-gcu: Return -EFAULT when copy_from_user() fails
  video: nuc900fb: properly free resources in nuc900fb_remove
  video: nuc900fb: fix compile error
---

9948d378b99b06f6f34164dd8ff827e228ae9251