From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Oct 2012 17:13:47 +0000 (-0700)
Subject: Merge tag 'ktest-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux... 
X-Git-Tag: upstream/snapshot3+hdmi~6620
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6977b4c7736e8809b7959c66875a16c0bbcf2152;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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
---

6977b4c7736e8809b7959c66875a16c0bbcf2152