]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'master' into sh/cachetlb
authorPaul Mundt <lethal@linux-sh.org>
Wed, 19 Aug 2009 00:12:00 +0000 (09:12 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 19 Aug 2009 00:12:00 +0000 (09:12 +0900)
Conflicts:
arch/sh/kernel/Makefile_64

1  2 
arch/sh/kernel/cpu/init.c
arch/sh/kernel/cpu/sh3/entry.S

Simple merge
Simple merge