]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 15015f9 b74e915)
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)
commit2b606f97de1811e4abbc59e2c55094562e3ea386
tree4063167be935320f13c56f4495af1d05312cfff8tree | snapshot
parent15015f988a13a416716ffc4350fc277d3ef1fc15commit | diff
parentb74e915128c59de09cf89b8bee8517cc295ad23ccommit | 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
Linux Kernel Source Tree.