Merge tag 'please-pull-einj' of git://git.kernel.org/pub/scm/linux/kernel/git/ras...
authorIngo Molnar <mingo@kernel.org>
Wed, 18 Dec 2013 09:49:02 +0000 (10:49 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 18 Dec 2013 09:49:02 +0000 (10:49 +0100)
commitcc131eef1cec905b9bdb0be6d7ab3af86f23de98
tree62610172a470b8b6ca6f82845506012fae1c827c
parent014952270eb9770a41084e74c721e4c07f2306c5
parent3482fb5e0c1c20ce0dbcfc5ca3b6558a8c455b10
Merge tag 'please-pull-einj' of git://git./linux/kernel/git/ras/ras into x86/ras

Pull error injection update from Tony Luck:

 * Add more flexibility to the error injection (EINJ) debugfs interface

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