| commit | 84bdd3a491aecd83781244a2f42d37625a9ed431 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Sep 25 18:02:30 2014 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Sep 25 18:02:30 2014 +0200 |
| tree | 1bf5d29686f8eb59a7dc2f69ae8db8be3539c374 | |
| parent | ea62edd850da4c0b277105877fa4adea5877b03e [diff] | |
| parent | 7a08cf77dbb976cec39c300201cebfee94552f54 [diff] |
Merge tag 'pxa-fix-abi' of https://git.kernel.org/pub/scm/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