tree f3d237e46ee08c15693e14c15ed1f93c1946c560
parent 2fe77b81c77eed92c4c0439f74c8148a295b4a86
parent 3989d17847071fa94c93299805a9cca27cf65d26
author Linus Torvalds <torvalds@linux-foundation.org> 1260593211 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260593211 -0800

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