| commit | d85eff51115d8ca74fb6fde750164b8360b9a858 | [log] [tgz] |
|---|---|---|
| author | Geert Uytterhoeven <geert+renesas@glider.be> | Wed Aug 13 12:09:35 2014 +0200 |
| committer | Geert Uytterhoeven <geert+renesas@glider.be> | Wed Aug 13 12:09:35 2014 +0200 |
| tree | 118c25febb68c204bab201f4984e80c89ff8cd02 | |
| parent | f3ffd7a48b3e3b926bfbd1ba6acd08fb74a2db34 [diff] | |
| parent | a0bbe990c161ddf56444efe80d9d6e15fdc47aca [diff] |
Merge remote-tracking branch 'slave-dma/next' into base Conflicts: drivers/dma/Makefile