| commit | 7aeb3be341cc7f1fbf2b98fbef980a816736fe8e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 20 09:49:54 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 20 09:49:54 2010 -0800 |
| tree | 38be8872bfd928fd128e64a8ea9754effb0c7220 | |
| parent | 07058599b486fe342f371200ac4718fedbe9a354 [diff] | |
| parent | e13416ae7f378f9963ceca596ac464d4120093f3 [diff] |
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