Skip to content
Snippets Groups Projects
Commit 65a9fb97 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git 

# Conflicts:
#	Documentation/devicetree/bindings/misc/atmel-ssc.txt
parents 079beb32 65654398
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 593 additions and 276 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment