Merge branch 'ARAM' of https://code.google.com/p/dolphin-emu into ARAM
* 'ARAM' of https://code.google.com/p/dolphin-emu: Fixed ARAM DMA overflow situations. Fixes issue 4952. Conflicts: Source/Core/Core/Src/HW/DSP.cpp
This commit is contained in:
commit
f28e0cff15