projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: efc176a cde7fc8)
Merge tag 'fixes-for-v3.18-rc2' of https://github.com/rjarzmik/linux into fixes
authorOlof Johansson <olof@lixom.net>
Mon, 27 Oct 2014 19:29:06 +0000 (12:29 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 27 Oct 2014 19:29:06 +0000 (12:29 -0700)
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.


Trivial merge