| commit | 6977b4c7736e8809b7959c66875a16c0bbcf2152 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 01 10:13:47 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 01 10:13:47 2012 -0700 |
| tree | 4063167be935320f13c56f4495af1d05312cfff8 | |
| parent | 69e9576bf283b0ee3423642d7e7dbe4b3a16e455 [diff] | |
| parent | 95f57838418358e93212e9dddd60d3502c7f8e2e [diff] |
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