From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 31 Mar 2013 18:41:47 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v3.9-rc5~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0bb44280b5ac45e5e911009e66c1d273bea4ccc6;p=linux.git

Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine fixes from Vinod Koul:
 "Two fixes for slave-dmaengine.

  The first one is for making slave_id value correct for dw_dmac and
  the other one fixes the endieness in DT parsing"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dw_dmac: adjust slave_id accordingly to request line base
  dmaengine: dw_dma: fix endianess for DT xlate function
---

0bb44280b5ac45e5e911009e66c1d273bea4ccc6