Merge branch 'sh/hwblk' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Thu, 12 Jan 2012 03:57:41 +0000 (12:57 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 12 Jan 2012 03:57:41 +0000 (12:57 +0900)
1  2 
arch/sh/include/cpu-sh4/cpu/sh7724.h
arch/sh/kernel/cpu/sh4a/setup-sh7722.c
arch/sh/kernel/cpu/sh4a/setup-sh7724.c

Simple merge