Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Nov 2011 17:50:42 +0000 (09:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Nov 2011 17:50:42 +0000 (09:50 -0800)
commitf10cdea68b70bd85706baed0decab59618f9c353
tree56e5246cc7ac0f606a13e775be632df462afc530
parent5907c5f8adbd0bb7ab69124520304e5b25c8eb5e
parentf9dfb65b055c56678afa03e13e942761459ea53d
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