summaryrefslogtreecommitdiffstats
path: root/mm/memblock.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-27 12:05:56 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-27 12:05:56 -0800
commit401d0069cb344f401bc9d264c31db55876ff78c0 (patch)
treee6f47b38877d8d7bfc772f7b97ff5439381bdd2e /mm/memblock.c
parent06718f151144aa5eea97cdf2813fe7eb70e73d17 (diff)
parenta32839696a8eef813a1aff604fbad9a32dff6c95 (diff)
Merge branch 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6
* 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6: viafb: correct sync polarity for OLPC DCON video:da8xx-fb: Disable and reset sequence on version2 of LCDC OMAPDSS: DISPC: skip scaling calculations when not scaling OMAPFB: fix compilation warnings due to missing include OMAPDSS: HDMI: fix returned HDMI pixel clock
Diffstat (limited to 'mm/memblock.c')
0 files changed, 0 insertions, 0 deletions