]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 028afd1 8e5ef5d)
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)
commit98c800e2e17bbe60016b966234fd20d1f1975b77
tree1bf5d29686f8eb59a7dc2f69ae8db8be3539c374tree | snapshot
parent028afd1c5b0f90be6fa526333877d3380df3c802commit | diff
parent8e5ef5d57bf97080229d9f2ffbc31d63f2de6800commit | 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 Source Tree.