diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-10-28 14:18:10 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-10-28 14:18:10 +0900 |
commit | 9060c05b503d9aa2c271d8946132a3ab2882bff2 (patch) | |
tree | d6ffa62356ce6ba7b198d9ad2e5f838cb2cfbe73 /arch/sh/kernel | |
parent | d4d9781d1dd04ff134e3d43383dfa9991f7c54c6 (diff) | |
parent | 6988d647231d284733f6c8bfea473a17dccdd39f (diff) | |
parent | 41309b7a22805f1650c600723d729af453d52719 (diff) |
Merge branches 'sh/core' and 'sh/kexec' into sh-latest