| commit | f46e374c1ea7fafce70a838f09fbd67de3e4d49f | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Sep 11 23:22:25 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Tue Sep 11 23:22:25 2012 -0700 |
| tree | e191e5316bdb8558bd3e2b0981c715bedd225ca7 | |
| parent | a4d3621e0d3ecf191961dc9214e4a378a7186780 [diff] | |
| parent | eb8ca943bae2b84c3fc14dfd7a908cb334465fef [diff] |
Merge branch 'boards' of git://git.kernel.org/pub/scm/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