Merge branch 'md-raid6-accel' into ioat3.2
Conflicts: include/linux/dmaengine.h
This commit is contained in:
1486
drivers/md/raid5.c
1486
drivers/md/raid5.c
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user