Merge branch 'master' into sh/smp
authorPaul Mundt <lethal@linux-sh.org>
Tue, 1 Sep 2009 04:54:14 +0000 (13:54 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 1 Sep 2009 04:54:14 +0000 (13:54 +0900)
commitac6a0cf6716bb46813d0161024c66c2af66e53d1
treec7f53b1a04c590032c022549f3186fb9b04f8358
parente76a0136a3cf1859fbc07f122e42293d22229558
parentce3f7cb96e67d6518c7fc7b361a76409c3817d64
Merge branch 'master' into sh/smp

Conflicts:
arch/sh/mm/cache-sh4.c
arch/sh/include/asm/processor.h
arch/sh/include/asm/system.h
arch/sh/include/asm/system_32.h
arch/sh/kernel/cpu/sh3/entry.S
arch/sh/kernel/cpu/sh4/probe.c
arch/sh/kernel/setup.c
arch/sh/lib/__clear_user.S
arch/sh/mm/cache-sh4.c
arch/sh/mm/tlb-sh4.c