From: Ingo Molnar Date: Wed, 18 Dec 2013 09:49:02 +0000 (+0100) Subject: Merge tag 'please-pull-einj' of git://git.kernel.org/pub/scm/linux/kernel/git/ras... X-Git-Tag: next-20131220~30^2^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cc131eef1cec905b9bdb0be6d7ab3af86f23de98;p=karo-tx-linux.git Merge tag 'please-pull-einj' of git://git.kernel.org/pub/scm/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 --- cc131eef1cec905b9bdb0be6d7ab3af86f23de98