From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 May 2010 21:40:30 +0000 (-0700)
Subject: Merge branch 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
X-Git-Tag: v2.6.35-rc1~447
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec2a7587e0a91d5c1afe23a0a73edfce06c5e4e0;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

* 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  drivers: video: msm: add include msm_mdp.h
  drivers: video: msm: default to no
---

ec2a7587e0a91d5c1afe23a0a73edfce06c5e4e0