aboutsummaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-08-19 09:12:00 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-08-19 09:12:00 +0900
commitee8365f23355cdb66e7a6c5c9364e8d3ba4de32f (patch)
treee77b5ff0d17eb583312fe710de569081a3ec8f8d /usr
parentsh: Merge the _32/_64 variants of arch/sh/mm/Makefile. (diff)
parentsh: Prevent heartbeat from scribbling over non-LED bits. (diff)
downloadlinux-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