Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Dec 2009 04:46:51 +0000 (20:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Dec 2009 04:46:51 +0000 (20:46 -0800)
commitc4e194e3b71ff4fed01d727c32ee1071921d28a3
treef3d237e46ee08c15693e14c15ed1f93c1946c560
parent2fe77b81c77eed92c4c0439f74c8148a295b4a86
parent3989d17847071fa94c93299805a9cca27cf65d26
Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

* 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  HTC Dream: mmc compilation fixes
  video: Allow selecting MSM framebuffer in Kconfig
  Add arm msm maintainer entry
  msm: Add memory map for HTC Dream
  msm: add minimal board file for HTC Dream device
  msm: make debugging UART (for DEBUG_LL) configurable
MAINTAINERS
drivers/video/Kconfig