From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Apr 2013 20:57:29 +0000 (-0700)
Subject: Merge tag 'ktest-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~11111
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5415ba99c229105a6939a7f9effe21045b8b2e5b;p=mirror_ubuntu-zesty-kernel.git

Merge tag 'ktest-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest

Pull ktest update from Steven Rostedt:
 "A couple of fixes to handle a config file that tests multiple machines
  and has conflicts it the grub menus.  That is, if the machines use the
  same grub menu name, but they are at different locations in the
  menu.lst file"

* tag 'ktest-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest: Reset grub menu cache with different machines
  ktest: Allow tests to use different GRUB_MENUs
---

5415ba99c229105a6939a7f9effe21045b8b2e5b