Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Aug 2010 17:07:32 +0000 (10:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Aug 2010 17:07:32 +0000 (10:07 -0700)
commitce4327d372af7e2f2d403286e9904ab012e72827
treeaa95c33aa9277d3ecb4d7c46cee13c8b59611c7c
parent4032816dca04141e3d49ec4ed717c9f7cc5444c5
parentb5d643de3ea28d7844a3a1a00a0a6f50897a2a6b
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>
arch/arm/mach-msm/acpuclock-arm11.c
arch/arm/mach-msm/board-trout.c
drivers/mmc/host/msm_sdcc.c
drivers/mmc/host/msm_sdcc.h