tree a4f4f4a720210dd4a7879f979c9c79b6d0b75a3f
parent af5329cdf51cdd208a323e521faa46800a16d2ec
parent 131b943ae643b1ad6febd67cdbb31d955706ecf4
author Linus Torvalds <torvalds@linux-foundation.org> 1216143159 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216143159 -0700

Merge branch 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  cputopology: always define CPU topology information, clean up
  cpu topology: always define CPU topology information