Merge branch 'core-hweight-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'core-hweight-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, hweight: Use a 32-bit popcnt for __arch_hweight32()
  arch, hweight: Fix compilation errors
  x86: Add optimized popcnt variants
  bitops: Optimize hweight() by making use of compile-time evaluation

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/alternative.h
Simple merge

diff --cc include/linux/bitops.h
Simple merge

diff --cc lib/Makefile
Simple merge