Merge tag 'ktest-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Oct 2012 17:13:47 +0000 (10:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Oct 2012 17:13:47 +0000 (10:13 -0700)
commit6977b4c7736e8809b7959c66875a16c0bbcf2152
tree4063167be935320f13c56f4495af1d05312cfff8
parent69e9576bf283b0ee3423642d7e7dbe4b3a16e455
parent95f57838418358e93212e9dddd60d3502c7f8e2e
Merge tag 'ktest-v3.7' of git://git./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