diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-04-05 20:45:55 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-04-05 20:45:55 +0530 |
| commit | 8673bcef8c1b07b83e9ee02d5e7f4b66507b03cd (patch) | |
| tree | bc08b79fe11c4745434da1cebc5fb8936f9c6831 /include/linux | |
| parent | e43a34e3ec5d1b14a11c3220f5a12aa797d73cd1 (diff) | |
| parent | e7c0fe2a5c84b7bf4dcbbce30953b04b95e9dc09 (diff) | |
Merge branch 'topic/bam' into for-linus
Conflicts:
drivers/dma/Makefile
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions