Merge "Added basic CPU topology information to cpuid code" into release-4-6
authorMark Abraham <mark.j.abraham@gmail.com>
Sun, 13 Jan 2013 15:06:11 +0000 (16:06 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sun, 13 Jan 2013 15:06:11 +0000 (16:06 +0100)

Trivial merge