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.