projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dbd366f 929a015)
Merge tag 'davinci-fixes-for-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Thu, 4 Sep 2014 19:51:05 +0000 (21:51 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 4 Sep 2014 19:51:05 +0000 (21:51 +0200)
commit28c2260f13c8ea3be6fcba1609502874f868284b
tree96be7d797fccb958a1b4249ed52136513820c230tree | snapshot
parentdbd366fdf2650531045ce47833b1efcdeec4dd86commit | diff
parent929a015b1809a30748d487f9d25b16a41434b61acommit | diff
Merge tag 'davinci-fixes-for-v3.17-rc4' of git://git./linux/kernel/git/nsekhar/linux-davinci into fixes

This patch fixes setup of second EDMA channel controller
on DA850.

* tag 'davinci-fixes-for-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: edma: Fix configuration parsing for SoCs with multiple eDMA3 CC
John Crispins staging tree