diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-08-19 09:12:00 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-19 09:12:00 +0900 |
commit | ee8365f23355cdb66e7a6c5c9364e8d3ba4de32f (patch) | |
tree | e77b5ff0d17eb583312fe710de569081a3ec8f8d /usr | |
parent | sh: Merge the _32/_64 variants of arch/sh/mm/Makefile. (diff) | |
parent | sh: Prevent heartbeat from scribbling over non-LED bits. (diff) | |
download | linux-dev-ee8365f23355cdb66e7a6c5c9364e8d3ba4de32f.tar.xz linux-dev-ee8365f23355cdb66e7a6c5c9364e8d3ba4de32f.zip |
Merge branch 'master' into sh/cachetlb
Conflicts:
arch/sh/kernel/Makefile_64
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions