Merge tag 'please-pull-einj-mmcfg' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Thu, 15 Jan 2015 10:30:57 +0000 (11:30 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 15 Jan 2015 10:30:57 +0000 (11:30 +0100)
commit93d76c802644e0cab62545603381988cef84d1d7
treefa3bf531dcdc93b42cc44dbb188441a979cffaa4
parent37e4d3b951d6d2f6e7280ee5bae6c22afe3abe1d
parentd91525eb8ee6a622ce476955fe1a2530ade87c83
Merge tag 'please-pull-einj-mmcfg' of git://git./linux/kernel/git/ras/ras into x86/ras

Pull RAS update from Tony Luck:

  "When checking addresses in APEI action entries for validity, allow
   access to the mmcfg space - some error injection functions need to do
   this."

Signed-off-by: Ingo Molnar <mingo@kernel.org>