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)
commit243e095446c12082f961ef15709927ccb8ea0cc1
treea97261913499975cdcc26da189d775198d5e01ea
parenteb9eef616b0ce14d554f75da197c0bfee8d2132f
parent26e87b13834f04fc209e887f124e8ef4f3ca526c
Merge branch 'msm-core' of git://git./linux/kernel/git/davidb/linux-msm into next/cleanup

* '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