From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Jan 2014 17:39:18 +0000 (-0800)
Subject: Merge tag 'ktest-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9451ee2d17e6b4bfbc5871f3c86ea744581b0413;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'ktest-v3.14' of git://git./linux/kernel/git/rostedt/linux-ktest

Pull ktest updates from Steven Rostedt:
 "Here's some basic updates to ktest.pl.  They include:

   - add config to modify the signal to terminate console
   - update to documentation (missing some config options)
   - add KERNEL_VERSION variable to use for other configs
   - add '=~' to let configs eval other configs
   - add BISECT_TRIES to run multiple tests per git bisect good"

* tag 'ktest-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest: Add BISECT_TRIES to bisect test
  ktest: Add eval '=~' command to modify variables in config file
  ktest: Add special variable ${KERNEL_VERSION}
  ktest: Add documentation of CLOSE_CONSOLE_SIGNAL
  ktest: Make the signal to terminate the console configurable
---

9451ee2d17e6b4bfbc5871f3c86ea744581b0413