diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-03-11 15:33:41 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-03-11 15:33:41 +0100 |
| commit | e76296580d32b2b967a395b9e77bc6f69d55852e (patch) | |
| tree | 7ec731e64502a5f33c39c4e496198af36d938ba7 /arch/arm/mach-sti | |
| parent | 8c1134080e9da5b485653d47962196a54d9ec006 (diff) | |
| parent | 5957457a2d96e4c9b2fecd40f29cdb3bb841d75e (diff) | |
Merge tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes
Pull "Second fixes batch for AT91 on 4.0" from Nicolas Ferre:
- little fix for !MMU debug: may also help for randconfig
- fix of 2 errors in LCD clock definitions
- in PM code, not writing the key leads to not execute the action
* tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91/pm: MOR register KEY was missing
ARM: at91/dt: sama5d4: fix lcdck clock definition
ARM: at91/dt: sama5d4: rename lcd_clk into lcdc_clk
ARM: at91: debug: fix non MMU debug
Diffstat (limited to 'arch/arm/mach-sti')
0 files changed, 0 insertions, 0 deletions