git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5907c5f f9dfb65)
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)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest: Check parent options for iterated tests


Trivial merge
Pandora Kernel Repository