tree c13052bba804bfec2febf66789fca50396d9517f
parent 0034102808e0dbbf3a2394b82b1bb40b5778de9e
parent af33eadc73e4a5d35a966c1c7ffe28a8424c9d96
author Olof Johansson <olof@lixom.net> 1334450661 -0700
committer Olof Johansson <olof@lixom.net> 1334450661 -0700

Merge branch 'msm-fix' of git://git.kernel.org/pub/scm/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