From: Olof Johansson <olof@lixom.net>
Date: Wed, 12 Sep 2012 06:22:25 +0000 (-0700)
Subject: Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f46e374c1ea7fafce70a838f09fbd67de3e4d49f;p=openwrt%2Fstaging%2Fblogic.git

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

f46e374c1ea7fafce70a838f09fbd67de3e4d49f