From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 25 Sep 2014 16:02:30 +0000 (+0200)
Subject: Merge tag 'pxa-fix-abi' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=84bdd3a491aecd83781244a2f42d37625a9ed431;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge tag 'pxa-fix-abi' of https://git./linux/kernel/git/hzhuang1/linux into next/dt

Pull "pxa2xx DT changes" from Haojian Zhuang:

Since DT aren't fully enabled in pxa2xx, it's fine to merge them in v3.18

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'pxa-fix-abi' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux:
  ARM: pxa: dts: fix ohci controller compatible string
  ARM: pxa: dts: fix mmc controller compatible string
---

84bdd3a491aecd83781244a2f42d37625a9ed431