Merge tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sun, 11 May 2014 05:06:07 +0000 (22:06 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 11 May 2014 05:06:07 +0000 (22:06 -0700)
commit3b27dcec920075b6f1f5f8014e32e764fcbb96f8
tree23f41a73480275c5c5222f24de59a2f07c5df73a
parent6a7c7b007a773a846090f2577de32e7b3a3f42ab
parentcf7eb979116c2568e8bc3b6a7269c7a359864ace
Merge tag 'davinci-fixes-for-v3.15-rc4' of git://git./linux/kernel/git/nsekhar/linux-davinci into fixes

Pull "DaVinci fixes for v3.15" from Sekhar Nori:

The patch fixes EDMA crossbar mapping to actually
make it work. The patch has been tagged for stable.

* tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: common: edma: Fix xbar mapping

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/boot/dts/am33xx.dtsi