OSDN Git Service

Merge branch 'topic/pxa' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Thu, 25 Jun 2015 03:51:58 +0000 (09:21 +0530)
committerVinod Koul <vinod.koul@intel.com>
Thu, 25 Jun 2015 03:51:58 +0000 (09:21 +0530)
commitf2704052cb42aabfa19b3f897cbceb70e2e63c45
tree441522897d4b6dcc2d5197d7711280214326f190
parent4fb9c15b4f2371b8640c411ceff2c100857aee2c
parentc91134d9194478144ba579ca6efeddf628055650
Merge branch 'topic/pxa' into for-linus
drivers/dma/Kconfig
drivers/dma/Makefile