]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jan 2011 23:01:22 +0000 (09:01 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jan 2011 23:01:22 +0000 (09:01 +1000)
commit9948d378b99b06f6f34164dd8ff827e228ae9251
tree35de4877d4745bb9f219178f33629980168ba74d
parentfd3830b379b87b9a47d796d79d1e41f73e1973fa
parent45f1798484748894c348a76fcf0b9ec43d891795
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