Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Mar 2009 22:32:55 +0000 (14:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Mar 2009 22:32:55 +0000 (14:32 -0800)
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: oprofile: don't set counter width from cpuid on Core2
  x86: fix init_memory_mapping() to handle small ranges


Trivial merge