From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 May 2011 15:20:44 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2e77defc5da779888f3cf65e66cd3d47ae2d690f;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of git://git./linux/kernel/git/rostedt/linux-2.6-ktest

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest:
  ktest: Allow options to be used by other options
  ktest: Create variables for the ktest config files
  ktest: Reboot after each patchcheck run
  ktest: Reboot to good kernel after every bisect run
  ktest: If test failed due to timeout, print that
  ktest: Fix post install command
---

2e77defc5da779888f3cf65e66cd3d47ae2d690f