recent code contribution (now with line ending fix)
Merge branch 'intel_contrib' of https://github.com/spaffy/shoc-mic into intel_contrib

* 'intel_contrib' of https://github.com/spaffy/shoc-mic:
  recent code contribution