Linus Torvalds df58bee21e Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (21 commits)
  x86, mce: Fix compilation with !CONFIG_DEBUG_FS in mce-severity.c
  x86, mce: CE in last bank prevents panic by unknown MCE
  x86, mce: Fake panic support for MCE testing
  x86, mce: Move debugfs mce dir creating to mce.c
  x86, mce: Support specifying raise mode for software MCE injection
  x86, mce: Support specifying context for software mce injection
  x86, mce: fix reporting of Thermal Monitoring mechanism enabled
  x86, mce: remove never executed code
  x86, mce: add missing __cpuinit tags
  x86, mce: fix "mce" boot option handling for CONFIG_X86_NEW_MCE
  x86, mce: don't log boot MCEs on Pentium M (model == 13) CPUs
  x86: mce: Lower maximum number of banks to architecture limit
  x86: mce: macros to compute banks MSRs
  x86: mce: Move per bank data in a single datastructure
  x86: mce: Move code in mce.c
  x86: mce: Rename CONFIG_X86_NEW_MCE to CONFIG_X86_MCE
  x86: mce: Remove old i386 machine check code
  x86: mce: Update X86_MCE description in x86/Kconfig
  x86: mce: Make CONFIG_X86_ANCIENT_MCE dependent on CONFIG_X86_MCE
  x86, mce: use atomic_inc_return() instead of add by 1
  ...

Manually fixed up trivial conflicts:
	Documentation/feature-removal-schedule.txt
	arch/x86/kernel/cpu/mcheck/mce.c
2009-09-17 21:07:08 -07:00
..
2009-08-15 11:58:02 +02:00
2009-04-08 11:51:46 -07:00
2009-02-10 00:41:58 +01:00
2009-01-29 14:16:51 +01:00
2009-01-29 14:17:01 +01:00
2009-08-08 17:44:11 +02:00
2009-04-07 13:36:36 +02:00
2009-06-11 23:31:52 +02:00
2009-06-11 23:31:52 +02:00
2009-03-27 14:43:57 -04:00
2008-12-12 11:58:36 +01:00
2009-04-10 20:27:13 +02:00
2009-04-29 06:54:34 +01:00
2009-01-21 17:26:06 +09:00
2009-06-13 15:37:30 +02:00
2009-09-10 10:46:49 +03:00
2009-09-10 08:33:12 +03:00
2009-07-30 16:03:46 +09:30
2009-05-18 09:21:04 +02:00
2009-02-05 22:30:14 +01:00
2009-09-09 13:29:18 -07:00
2009-02-02 23:27:09 +05:30
2009-06-15 12:40:02 +02:00
2009-06-15 12:40:02 +02:00
2009-04-01 08:59:16 -07:00
2009-01-31 00:19:32 +05:30
2009-03-27 14:43:57 -04:00
2009-09-16 16:44:33 +02:00
2009-07-19 18:27:52 +02:00
2008-11-09 21:05:43 +01:00
2008-12-14 16:24:38 -08:00
2009-06-15 12:40:02 +02:00