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

* 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  msm: mmc: Add msm prefix to platform data structure
  msm: trout: Remove extern declaration from source file
  arm: msm: Fix section mismatch in smd.c.
  arm: msm: trout add mmc support
  arm: msm: trout: add trout specific gpio interrupts
  arm: msm: remove unused #include <linux/version.h>

diff --cc arch/arm/mach-msm/acpuclock-arm11.c
Simple merge

diff --cc arch/arm/mach-msm/board-trout.c
Simple merge

diff --cc drivers/mmc/host/msm_sdcc.c
Simple merge

diff --cc drivers/mmc/host/msm_sdcc.h
Simple merge