From: Olof Johansson <olof@lixom.net>
Date: Sun, 15 Apr 2012 00:44:21 +0000 (-0700)
Subject: Merge branch 'msm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9e7bcbe8be1088ce53998db477c938818f9ace36;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'msm-fix' of git://git./linux/kernel/git/davidb/linux-msm into fixes

From David Brown:
  "Here are some fixes for msm that fix problems caused by the latest
   ARM code.  The ones from Daniel remove unneeded fixups that now
   cause compilation failures.  Mine fix section mismatches, that were
   incompletely fixed earlier."

* 'msm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  ARM: msm: Fix section mismatches in proc_comm.c
  video: msm: Fix section mismatches in mddi.c
  arm: msm: trout: fix compile failure
  arm: msm: halibut: remove unneeded fixup
---

9e7bcbe8be1088ce53998db477c938818f9ace36