From: Arnd Bergmann 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-Tag: fixes-for-v3.18-merge-window~4^2~14 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84bdd3a491aecd83781244a2f42d37625a9ed431;p=pandora-kernel.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 * 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 Reading git-diff-tree failed