Merge branch 'msm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux...
authorOlof Johansson <olof@lixom.net>
Sat, 12 May 2012 05:31:02 +0000 (22:31 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 12 May 2012 05:31:02 +0000 (22:31 -0700)
* 'msm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  ARM: msm: fix compilation flags for MSM_SCM (part 2)
  arch/arm/mach-msm: linux/gpio.h included twice
  ARM: msm: Drop useless teq from DEBUG_LL support


Trivial merge