Merge tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 21:55:53 +0000 (14:55 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 21:55:53 +0000 (14:55 -0700)
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

1  2 
arch/arm/boot/dts/am33xx.dtsi

Simple merge