From: Olof Johansson <olof@lixom.net>
Date: Wed, 5 Sep 2012 22:33:19 +0000 (-0700)
Subject: Merge branch 'kzm9g' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas... 
X-Git-Tag: v3.7-rc1~160^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=301fd5c13257862df66c81c48d963d474e63e0ef;p=thirdparty%2Flinux.git

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
---

301fd5c13257862df66c81c48d963d474e63e0ef