Merge remote-tracking branch 'origin/ide_refactor' into ide_refactor · artiepoole/ArtOS@a5db507 · GitHub

Commit

Merge remote-tracking branch 'origin/ide_refactor' into ide_refactor

Browse files

# Conflicts:
#	Generic/main.cpp
#	Specific/Devices/Storage/IDEDrive/IDE_notifiable.cpp
#	Specific/x86/Drivers/Storage/ATA.cpp
#	Specific/x86/Drivers/Storage/ATAPIDrive.cpp
#	Specific/x86/Drivers/Storage/IDEStorageContainer.cpp
#	Specific/x86/Drivers/Storage/IDE_DMA_PRDT.h

Loading branch information

artiepoole committed Sep 22, 2024

2 parents 407f4d5 + 2a725c3 commit a5db507