| commit | 393ce5aa3641bee4dcb1bf3f57ee47cd836b7378 | [log] [tgz] |
|---|---|---|
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | Thu Jan 29 12:37:47 2015 +0100 |
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | Thu Jan 29 12:37:47 2015 +0100 |
| tree | 4cc9bd7efadbc53e036af44fa403e7e7577f452a | |
| parent | d9320066de101bb40dd0d334ec4f8da89ed35730 [diff] | |
| parent | fa9df37f603459bf08a4f8fc99337874c677e2bf [diff] |
Merge tag 'at91-cleanup4' into arm-soc-for-next+at91-3.20-cleanup Fourth cleanup/soc batch for 3.20: - merge all the at91sam9 code and remove the empty SoC-specific files - remove the at91_boot_soc that is now useless in a DT context - move the sram code in PM code as it's now only used there - some file + function name changes after this big cleanup Conflicts: arch/arm/mach-at91/board-dt-sama5.c