Skip to content
Commit f9dd2134 authored by Dan Williams's avatar Dan Williams
Browse files

Merge branch 'md-raid6-accel' into ioat3.2 

Conflicts:
	include/linux/dmaengine.h
parents 4b652f0d 07a3b417
Expand all Hide whitespace changes
Inline Side-by-side
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