Merge branch 'kzm9g' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas...
authorOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 22:33:19 +0000 (15:33 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 22:33:19 +0000 (15:33 -0700)
* 'kzm9g' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: kzm9g: enable restarting
  + sync to 3.6-rc3


Trivial merge