]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fixes' into for-next
authorOlof Johansson <olof@lixom.net>
Sun, 11 May 2014 05:16:49 +0000 (22:16 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 11 May 2014 05:16:49 +0000 (22:16 -0700)
* fixes:
  ARM: common: edma: Fix xbar mapping

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

Simple merge