Added the secondary patch mentioned by ajvondrak
Merge branch 'master' of https://github.com/DrItanium/theoretical-architecture into iris