| commit | e86f0ad930f0ba501d1ba0b94f873b7bcafc1519 | [log] [tgz] |
|---|---|---|
| author | Simon Horman <horms+renesas@verge.net.au> | Fri Apr 12 12:12:51 2013 +0900 |
| committer | Simon Horman <horms+renesas@verge.net.au> | Fri Apr 12 12:12:51 2013 +0900 |
| tree | 41febd0f878b935f4d3b382e2b12a9610356ff6d | |
| parent | f73cdc1ecba27663ed9816724e45d09233b20727 [diff] | |
| parent | cd94b804df45776d817e5d7413a26b354598b68b [diff] |
Merge branch 'backport/ltsi-3.4.25/lager-2' into backport/ltsi-3.4.25/h2-base-7 Conflicts: arch/arm/mach-shmobile/board-marzen.c