diff options
| author | Linus Torvalds | 2012-10-01 19:13:47 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-10-01 19:13:47 +0200 |
| commit | 6977b4c7736e8809b7959c66875a16c0bbcf2152 (patch) | |
| tree | 4063167be935320f13c56f4495af1d05312cfff8 /arch/um/drivers/mconsole_kern.c | |
| parent | Merge tag 'localmodconfig-v3.7-2' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | ktest: Fix ELSE IF statements (diff) | |
| download | kernel-qcow2-linux-6977b4c7736e8809b7959c66875a16c0bbcf2152.tar.gz kernel-qcow2-linux-6977b4c7736e8809b7959c66875a16c0bbcf2152.tar.xz kernel-qcow2-linux-6977b4c7736e8809b7959c66875a16c0bbcf2152.zip | |
Merge tag 'ktest-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest
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
Diffstat (limited to 'arch/um/drivers/mconsole_kern.c')
0 files changed, 0 insertions, 0 deletions