diff options
| author | Linus Torvalds | 2013-04-29 13:57:29 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2013-04-29 13:57:29 -0700 |
| commit | 5415ba99c229105a6939a7f9effe21045b8b2e5b (patch) | |
| tree | 6fbf10cfba3e946f8011539408c843c038564e1a /include/trace | |
| parent | 9e8529afc4518f4e5d610001545ebc97e1333c79 (diff) | |
| parent | df5f7c66013c46cec9aa8156af257bc5eb29b5c5 (diff) | |
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
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions