summaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-05 22:33:19 (GMT)
committerOlof Johansson <olof@lixom.net>2012-09-05 22:33:19 (GMT)
commit301fd5c13257862df66c81c48d963d474e63e0ef (patch)
tree128af89336dd8b1ee62696c4588057b2eb0b445e /arch/cris
parentdaa56a06b5a592ceb69130a1d15c067a078f2701 (diff)
parent7952717adb69efc1d2443a1858f96d23c2fb93e0 (diff)
downloadlinux-301fd5c13257862df66c81c48d963d474e63e0ef.tar.xz
Merge branch 'kzm9g' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
* 'kzm9g' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: kzm9g: enable restarting + sync to 3.6-rc3
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions