summaryrefslogtreecommitdiffstats
path: root/drivers/s390/char/con3215.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-09-04 21:51:05 +0200
committerArnd Bergmann <arnd@arndb.de>2014-09-04 21:51:05 +0200
commit28c2260f13c8ea3be6fcba1609502874f868284b (patch)
tree96be7d797fccb958a1b4249ed52136513820c230 /drivers/s390/char/con3215.c
parentARM: ux500: disable msp2 node on Snowball (diff)
parentARM: edma: Fix configuration parsing for SoCs with multiple eDMA3 CC (diff)
downloadlinux-28c2260f13c8ea3be6fcba1609502874f868284b.tar.xz
linux-28c2260f13c8ea3be6fcba1609502874f868284b.zip
Merge tag 'davinci-fixes-for-v3.17-rc4' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/s390/char/con3215.c')
0 files changed, 0 insertions, 0 deletions