diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-11 22:31:02 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-11 22:31:02 -0700 |
commit | 243e095446c12082f961ef15709927ccb8ea0cc1 (patch) | |
tree | a97261913499975cdcc26da189d775198d5e01ea /arch/arm/mach-msm/devices-msm7x00.c | |
parent | eb9eef616b0ce14d554f75da197c0bfee8d2132f (diff) | |
parent | 26e87b13834f04fc209e887f124e8ef4f3ca526c (diff) |
Merge branch 'msm-core' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/arm/mach-msm/devices-msm7x00.c')
0 files changed, 0 insertions, 0 deletions