From: Linus Torvalds 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: v3.2-rc3~5 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=f10cdea68b70bd85706baed0decab59618f9c353;hp=5907c5f8adbd0bb7ab69124520304e5b25c8eb5e 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 --- Reading git-diff-tree failed