projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
69e9576
95f5783
)
Merge tag 'ktest-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 1 Oct 2012 17:13:47 +0000
(10:13 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 1 Oct 2012 17:13:47 +0000
(10:13 -0700)
Pull ktest fix from Steven Rostedt:
"ktest has one fix needed for this merge window - fix parsing of ELSE
IF in reading config file"
* tag 'ktest-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
ktest: Fix ELSE IF statements
Trivial merge