Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas...
authorOlof Johansson <olof@lixom.net>
Wed, 12 Sep 2012 06:22:25 +0000 (23:22 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 12 Sep 2012 06:22:25 +0000 (23:22 -0700)
commitf46e374c1ea7fafce70a838f09fbd67de3e4d49f
treee191e5316bdb8558bd3e2b0981c715bedd225ca7
parenta4d3621e0d3ecf191961dc9214e4a378a7186780
parenteb8ca943bae2b84c3fc14dfd7a908cb334465fef
Merge branch 'boards' of git://git./linux/kernel/git/horms/renesas into next/boards

* 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: marzen: enable thermal sensor
  ARM: shmobile: marzen: fixup regulator id for smsc911x
  ARM: shmobile: marzen: add SDHI0 support
  + sync to 3.6-rc4