Merge tag 'pxa-fixes-v4.6' of https://github.com/rjarzmik/linux into fixes
authorOlof Johansson <olof@lixom.net>
Tue, 12 Apr 2016 19:33:41 +0000 (12:33 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 12 Apr 2016 19:33:41 +0000 (12:33 -0700)
commit13ab2c80e2aae436fa7f0b8a1b0133e9c143f42b
tree62d4315feb536071e3f3b65fc3778fb86b381b25
parent2e1d18c6997da888217f66b0bdc210de9742b936
parent4c35430ad18f5a034302cb90e559ede5a27f93b9
Merge tag 'pxa-fixes-v4.6' of https://github.com/rjarzmik/linux into fixes

ARM: pxa: fixes for v4.6

There is only a single fix for dma requestor lines initial
setup, triggered by dmaengine previous fix.

* tag 'pxa-fixes-v4.6' of https://github.com/rjarzmik/linux:
  ARM: pxa: fix the number of DMA requestor lines

Signed-off-by: Olof Johansson <olof@lixom.net>