edit
Update
Merge branch 'master' of https://github.com/xenatt/Hackintosh

Conflicts:
	DSDT/Patch/.maciasl