From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Dec 2010 17:49:54 +0000 (-0800)
Subject: Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~23769
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7aeb3be341cc7f1fbf2b98fbef980a816736fe8e;p=mirror_ubuntu-focal-kernel.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:
  OMAP: OMAPFB: disable old omapfb for OMAP4 builds
  OMAP: DSS: VRAM: Align start & size of vram to 2M
---

7aeb3be341cc7f1fbf2b98fbef980a816736fe8e