]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'for-linus' into next
authorVinod Koul <vinod.koul@intel.com>
Sat, 31 Oct 2015 02:08:05 +0000 (07:38 +0530)
committerVinod Koul <vinod.koul@intel.com>
Sat, 31 Oct 2015 02:08:05 +0000 (07:38 +0530)
commit6782af4b40713cde1a95c069d496ddc768a371a8
tree3524ca01a9b622b57ea4f5796496a9fc17f15c17
parent55dcb786c19f1ef869f56010848272d9c62779c2
parent926a3ffe346a2e47fe35ace004cbea52587688eb
Merge branch 'for-linus' into next

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