]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ea62edd 7a08cf7)
Merge tag 'pxa-fix-abi' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1...
authorArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 16:02:30 +0000 (18:02 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 16:02:30 +0000 (18:02 +0200)
commit84bdd3a491aecd83781244a2f42d37625a9ed431
tree1bf5d29686f8eb59a7dc2f69ae8db8be3539c374tree | snapshot
parentea62edd850da4c0b277105877fa4adea5877b03ecommit | diff
parent7a08cf77dbb976cec39c300201cebfee94552f54commit | 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
Linux kernel for KaRo TX COM modules