| commit | 4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793 | [log] [tgz] |
|---|---|---|
| author | Simon Horman <horms+renesas@verge.net.au> | Tue Aug 06 18:06:53 2013 +0900 |
| committer | Simon Horman <horms+renesas@verge.net.au> | Tue Aug 06 18:06:53 2013 +0900 |
| tree | 3932656b422e63e3d3fc4629a57a1a8b7f03ef42 | |
| parent | 98724b7ec9d34d875fc193660c87d6dd0d17ceb7 [diff] | |
| parent | 8b3e32c1fe5dce55e28e76b20361841dc863ec17 [diff] |
Merge branch 'dt2' into cleanup3-base Conflicts: arch/arm/mach-shmobile/Makefile.boot