linux-stable/Documentation
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-09-15 09:37:12 -07:00
2008-10-30 11:38:45 -07:00
2009-04-07 08:12:38 +02:00
2007-07-19 10:04:47 -07:00
2008-02-14 00:16:13 -05:00
2008-10-16 11:21:30 -07:00
2009-06-22 10:12:35 +01:00
2009-06-16 19:47:58 -07:00
2008-02-03 15:54:28 +02:00
2009-03-30 15:21:59 +02:00
2009-06-20 01:10:38 -07:00
2009-09-10 10:46:55 +03:00
2008-01-11 18:22:30 -06:00
2007-05-09 08:57:56 +02:00
2005-04-16 15:20:36 -07:00
2008-10-30 11:38:45 -07:00
2009-06-18 13:04:04 -07:00
2009-08-23 10:32:40 +02:00
2009-06-30 18:56:00 -07:00
2009-09-11 10:29:49 +02:00
2008-04-29 02:49:47 -04:00
2006-11-30 04:58:40 +01:00
2008-12-03 16:09:53 -07:00
2008-07-25 10:53:30 -07:00
2008-11-12 17:17:18 -08:00
2007-10-19 11:53:34 -07:00
2008-11-14 10:39:26 +11:00
2009-09-15 17:04:38 -07:00
2006-11-30 04:58:40 +01:00
2009-06-30 18:55:59 -07:00
2008-03-24 19:22:19 -07:00
2005-04-16 15:20:36 -07:00
2007-10-18 14:37:32 -07:00
2005-04-16 15:20:36 -07:00
2008-02-06 10:41:09 -08:00
2008-10-20 15:43:10 +02:00
2009-04-27 12:00:27 -07:00
2009-04-27 12:00:27 -07:00
2008-08-12 16:07:30 -07:00
2009-03-31 15:18:37 +11:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2008-11-12 17:17:17 -08:00
2006-06-27 17:32:47 -07:00
2008-02-06 10:41:14 -08:00
2005-04-16 15:20:36 -07:00
2005-06-21 18:46:32 -07:00
2005-04-16 15:20:36 -07:00
2009-04-14 09:00:23 +10:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00