Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Jun 2012 17:29:54 +0000 (10:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Jun 2012 17:29:54 +0000 (10:29 -0700)
commit15b77435edad42c1b25adaafce2be50e8d29b2fc
tree8e8a34828b50502eea491023e3d3d69f33786d4b
parent62a75b99ad3595c8b92eb584dd61a93f5a0e8828
parent1b6b7c9ff3514772958c075f8c89e42dddf6a4d8
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar.

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, cpufeature: Remove stray %s, add -w to mkcapflags.pl
  x86, cpufeature: Catch duplicate CPU feature strings
  x86, cpufeature: Rename X86_FEATURE_DTS to X86_FEATURE_DTHERM
  x86: Fix kernel-doc warnings
  x86, compat: Use test_thread_flag(TIF_IA32) in compat signal delivery
drivers/hwmon/coretemp.c