Merge branch 'master' into sh/hwblk
authorPaul Mundt <lethal@linux-sh.org>
Sat, 15 Aug 2009 04:00:02 +0000 (13:00 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Sat, 15 Aug 2009 04:00:02 +0000 (13:00 +0900)
commit4b6b987969b076298485697bfb0d0e35502642a3
treea8f5ebd6a0b9efbe30272012d759669b0c5ddc13
parentdf47cd096c8f54a5242e3a2ffb4525c804567eda
parent60e0a4c7adc700f2d2929cdb2d0055e519a3eb3d
Merge branch 'master' into sh/hwblk
arch/sh/boards/board-ap325rxa.c
arch/sh/boards/mach-kfr2r09/setup.c
arch/sh/boards/mach-migor/setup.c
arch/sh/boards/mach-se/7724/setup.c
drivers/base/platform.c