From: Olof Johansson <olof@lixom.net>
Date: Mon, 27 Oct 2014 19:29:06 +0000 (-0700)
Subject: Merge tag 'fixes-for-v3.18-rc2' of https://github.com/rjarzmik/linux into fixes
X-Git-Tag: v3.18-rc4~30^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f6fc15a13e4d2f159513bc8e704e533fb6e4110;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'fixes-for-v3.18-rc2' of https://github.com/rjarzmik/linux into fixes

Merge "arm: pxa: fixes for v3.18-rc2" from Robert Jarzmik:

One small fix for a bug triggered by the activation of low level debug
code in all pxa variants in v3.17. The fix is a trivial Kconfig value
fix for an addressing conflict.
---

1f6fc15a13e4d2f159513bc8e704e533fb6e4110