From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Apr 2014 04:27:43 +0000 (-0700)
Subject: Merge tag 'ktest-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v3.15-rc1~87
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=05b1332eafba8eb250da2d2c4c52ed436a127f90;p=~emulex%2Finfiniband.git

Merge tag 'ktest-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest

Pull single ktest fix from Steven Rostedt:
 "This just contains a single update by Satoru Takeuchi, which adds
  CLOSE_CONSOLE_SIGNAL to the kvm.conf file, as the kvm guest requires a
  different signal than a normal console uses"

* tag 'ktest-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest: Set CLOSE_CONSOLE_SIGNAL in the kvm.conf
---

05b1332eafba8eb250da2d2c4c52ed436a127f90