Merge branch 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Jul 2008 17:32:39 +0000 (10:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Jul 2008 17:32:39 +0000 (10:32 -0700)
commite7849f16c13476288fe4fbd420975e8456c75aa0
treea4f4f4a720210dd4a7879f979c9c79b6d0b75a3f
parentaf5329cdf51cdd208a323e521faa46800a16d2ec
parent131b943ae643b1ad6febd67cdbb31d955706ecf4
Merge branch 'core/topology' of git://git./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
drivers/base/topology.c