Merge tag 'at91-fixes3' into at91-4.1-multiplatform
authorNicolas Ferre <nicolas.ferre@atmel.com>
Mon, 16 Mar 2015 17:09:34 +0000 (18:09 +0100)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Mon, 16 Mar 2015 17:09:34 +0000 (18:09 +0100)
commit5e358e3991dcf62a4b3cdf8085ead6b4a25ba08b
tree53338dc5f37130cb0a92d04aed8981a6751fee66
parenta697d40a8aab4b67c0f11fb6105c6c4edcbd0c81
parente7b848d731cdf681e06138a2ae4380220a6baac8
Merge tag 'at91-fixes3' into at91-4.1-multiplatform

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