From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Oct 2010 01:57:04 +0000 (-0700)
Subject: Merge branches 'msm-fixes' and 'msm-video' of git://codeaurora.org/quic/kernel/dwalke... 
X-Git-Tag: firefly_0821_release~7613^2~3550
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c0f62edd400115e54c52692c1dc6f5bf58ea0ba6;p=firefly-linux-kernel-4.4.55.git

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

* 'msm-fixes' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  msm: Kconfig: drop unused config options
  msm: fix compile failure when no debug uart is selected
  msm: fix debug-macro.S build failure
  msm: timer: Decrease shift on timer clocksource
  arm: mach-msm: fix error handling in msm_iommu_probe()
  msm: fix Kconfig target board selection
  msm: fix compile failure on struct membank node member

* 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  drivers/video/msm/mddi.c: Remove multiple KERN_<level> uses
  drivers: msm: video: add dev_set_name call
  drivers: video: msm: fix hang on disable_irq
---

c0f62edd400115e54c52692c1dc6f5bf58ea0ba6