From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Nov 2011 17:50:42 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: firefly_0821_release~3680^2~4052
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f10cdea68b70bd85706baed0decab59618f9c353;p=firefly-linux-kernel-4.4.55.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest: Check parent options for iterated tests
---

f10cdea68b70bd85706baed0decab59618f9c353