| commit | 1f6fc15a13e4d2f159513bc8e704e533fb6e4110 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Mon Oct 27 12:29:06 2014 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Mon Oct 27 12:29:06 2014 -0700 |
| tree | eda50c5e11ea249de5bee40041f48454b7a9a069 | |
| parent | efc176a8ee1f959b89292597bd8a99417475a79a [diff] | |
| parent | cde7fc879969f933614b1256df2625d6ff637bab [diff] |
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.