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)
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>
1  2 
arch/arm/boot/dts/am33xx.dtsi

Simple merge