minor kernel re-ordering for VLIW5
merge conflict resolved
Merge branch 'master' of github.com:Bdot42/mfakto
kernel order for CPU device