From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 11 Mar 2015 19:46:52 +0000 (+0100)
Subject: Merge tag 'at91-fixes3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux... 
X-Git-Tag: v4.0-rc4~3^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=30fa7e0e85699f4887cf824401a4fd7f8174e603;p=linux-2.6-block.git

Merge tag 'at91-fixes3' of git://git./linux/kernel/git/nferre/linux-at91 into fixes

Pull "Third fixes batch for AT91 on 4.0" from Nicolas Ferre:
- clock fixes for USB
- compatible string changes for handling USB IP differences
  (+ needed AHB matrix syscon)
- fix of a compilation error in PM code

* tag 'at91-fixes3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91: pm_slowclock: fix the compilation error
  ARM: at91/dt: fix USB high-speed clock to select UTMI
  ARM: at91/dt: fix at91 udc compatible strings
  ARM: at91/dt: declare matrix node as a syscon device
  ARM: at91/dt: at91sam9261: fix clocks and clock-names in udc definition
---

30fa7e0e85699f4887cf824401a4fd7f8174e603