Merge branch 'topic/xilinx' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Mon, 9 Jun 2014 16:26:29 +0000 (21:56 +0530)
committerVinod Koul <vinod.koul@intel.com>
Mon, 9 Jun 2014 16:26:29 +0000 (21:56 +0530)
1  2 
drivers/dma/Kconfig

Simple merge