From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 11 Mar 2015 14:33:41 +0000 (+0100)
Subject: Merge tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux... 
X-Git-Tag: firefly_0821_release~176^2~2154^2~7
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e76296580d32b2b967a395b9e77bc6f69d55852e;p=firefly-linux-kernel-4.4.55.git

Merge tag 'at91-fixes2' of git://git./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
---

e76296580d32b2b967a395b9e77bc6f69d55852e