| commit | bd43400c58ca438762fcc5b64c95a906634f543b | [log] [tgz] |
|---|---|---|
| author | Dan Williams <dan.j.williams@intel.com> | Sun Sep 28 07:46:14 2014 -0700 |
| committer | Dan Williams <dan.j.williams@intel.com> | Sun Sep 28 07:46:14 2014 -0700 |
| tree | 3f66166740cc8cda5c6f732c48d0245d27d4358b | |
| parent | 3f334078567245429540e6461c81c749fce87f70 [diff] | |
| parent | 0f33be009b89d2268e94194dc4fd01a7851b6d51 [diff] |
Merge commit 'v3.17-rc6' into dmaengine The net_dma removal commit from 3.14-rc7 developed conflicts against mainline.