tree 3f66166740cc8cda5c6f732c48d0245d27d4358b
parent 3f334078567245429540e6461c81c749fce87f70
parent 0f33be009b89d2268e94194dc4fd01a7851b6d51
author Dan Williams <dan.j.williams@intel.com> 1411915574 -0700
committer Dan Williams <dan.j.williams@intel.com> 1411915574 -0700

Merge commit 'v3.17-rc6' into dmaengine

The net_dma removal commit from 3.14-rc7 developed conflicts against
mainline.