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)
commit9d14070f656addddce3d63fd483de46930b51850
treea8767c2547dd2b6f49974503a5169d8c08de00e9
parent9f06cf38eca57e279b4c78e465e19f10c2f78174
parenta319add1e24c43d285b781332cfa532405466650
Merge branch 'sh/hwblk' into sh-latest
arch/sh/include/cpu-sh4/cpu/sh7724.h
arch/sh/kernel/cpu/sh4a/setup-sh7722.c
arch/sh/kernel/cpu/sh4a/setup-sh7724.c