]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'fixes' into next
authorVinod Koul <vinod.koul@intel.com>
Fri, 25 Oct 2013 05:50:05 +0000 (11:20 +0530)
committerVinod Koul <vinod.koul@intel.com>
Fri, 25 Oct 2013 05:50:05 +0000 (11:20 +0530)
commit10ca2dddb3b5f11a7715e1415907c5bce35f771f
treea3b80ecb9d04bcc80fb8c4bd99963a514f632e37
parent2abd5f1b97fce6e197be01d67a9567c7793c80d3
parent7261828776b33ff434837674413df2920e9ca2ff
Merge branch 'fixes' into next

Conflicts:
drivers/dma/edma.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/edma.c