diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-24 13:34:54 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-24 13:34:54 -0800 |
commit | 58e868be77bda526cc8d4264488ed393bc607720 (patch) | |
tree | f95692355ca78239815c1df58fe2fee7dc79d80d /drivers/dma/ioat/dma.c | |
parent | d91f9ecfd147bbb2d3089b2e2a603087c668db82 (diff) | |
parent | cfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff) |
Merge 3.14-rc4 into char-misc-linus
Merge this to catch up with the other patches sent upstream.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/dma/ioat/dma.c')
0 files changed, 0 insertions, 0 deletions