From: Olof Johansson <olof@lixom.net>
Date: Sat, 12 May 2012 05:31:02 +0000 (-0700)
Subject: Merge branch 'msm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux... 
X-Git-Tag: v3.5-rc1~156^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=243e095446c12082f961ef15709927ccb8ea0cc1;p=platform%2Fkernel%2Flinux-exynos.git

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

243e095446c12082f961ef15709927ccb8ea0cc1