| commit | 661a7335c4e47726df1e7264580209847509569a | [log] [tgz] |
|---|---|---|
| author | Simon Horman <horms+renesas@verge.net.au> | Tue Oct 08 10:01:47 2013 +0900 |
| committer | Simon Horman <horms+renesas@verge.net.au> | Tue Oct 08 10:01:47 2013 +0900 |
| tree | 9f86456e42fd13c3b82f630e6319faa3e6146732 | |
| parent | 63862f14bdf9e1251b7398947265422ec9b1400b [diff] | |
| parent | 687c27b07050c21a62c4c975777c89e698649a6b [diff] |
Merge branch 'heads/soc2' into boards2-base Conflicts: arch/arm/mach-shmobile/board-lager.c