]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Oct 2017 19:19:11 +0000 (15:19 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Oct 2017 19:19:11 +0000 (15:19 -0400)
Pull RAS fixes from Ingo Molnar:
 "A boot parameter fix, plus a header export fix"

* 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Hide mca_cfg
  RAS/CEC: Use the right length for "cec_disable"


Trivial merge