Merge tag 'qcom-soc-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Sat, 31 May 2014 03:34:23 +0000 (20:34 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 31 May 2014 03:34:23 +0000 (20:34 -0700)
commitb4c48e8780325e1f2ba79ccc0fb2a6c99c7cfac2
tree6c7d1d5f5277a8c115c3c8418e080c438c7bb646
parent7db76c4154a3633577903b171e3ddb484498df85
parent2f528dd3b30c4351c0ece73b8bdc39753c02003b
Merge tag 'qcom-soc-for-3.16-2' of git://git./linux/kernel/git/galak/linux-qcom into next/soc

Merge "Qualcomm ARM Based SoC Updates for v3.16-2" from Kumar Gala:

* Updated Kconfig DEBUG_QCOM_UARTDM help to include APQ8084 info

* tag 'qcom-soc-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: debug: qcom: add UART addresses to Kconfig help for APQ8084

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/Kconfig.debug