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)
commitee8365f23355cdb66e7a6c5c9364e8d3ba4de32f
treee77b5ff0d17eb583312fe710de569081a3ec8f8d
parent1b3edd9745ef3a9ee831fe5a611757686579c9e1
parente174d13010a6bd52045466bc35ca5a86e3f3ba9b
Merge branch 'master' into sh/cachetlb

Conflicts:
arch/sh/kernel/Makefile_64
arch/sh/kernel/cpu/init.c
arch/sh/kernel/cpu/sh3/entry.S