From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Dec 2012 17:59:59 +0000 (-0800)
Subject: Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.8~324
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d9c8b5d6a5f5f7a6111cc68a050b5b44729376b;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'x86-ras-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 RAS update from Ingo Molnar:
 "Rework all config variables used throughout the MCA code and collect
  them together into a mca_config struct.  This keeps them tightly and
  neatly packed together instead of spilled all over the place.

  Then, convert those which are used as booleans into real booleans and
  save some space.  These bits are exposed via
     /sys/devices/system/machinecheck/machinecheck*/"

* 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, MCA: Finish mca_config conversion
  x86, MCA: Convert the next three variables batch
  x86, MCA: Convert rip_msr, mce_bootlog, monarch_timeout
  x86, MCA: Convert dont_log_ce, banks and tolerant
  drivers/base: Add a DEVICE_BOOL_ATTR macro
---

2d9c8b5d6a5f5f7a6111cc68a050b5b44729376b