Linus Torvalds 5415ba99c2 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. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJRfneBAAoJEOdOSU1xswtMB/EIAMBKvuyNDUch0ym5d/rKV0Vn okmD8UM0aL/LKkhSHO1LlPusl+3nCF1cW9BNAEZ1b+orP/ipLL971s3tE1pJjfQU mHo8HpfnxrCJweczjWX3XVqtG1WBwMqMOEs1Zfg6ybuN10hVHMwfd5CVWLmRg2mi 3sSaktQnYkFwjcujlbjVFNlenLu5pBXFFy1MdHIR9uZV4GIJM5kNL68+82T4VC6A gQCm40KpyaHzNmsxnVxosKOD2vHOq/OdxLs/J39qvdEO2wZOMAH/YLYOCz+eq1WO tD0cQ3P2IbrDFx7Wm25JMcmM+9GumClIwGF96Q+9WRhEyY3w0j7VNGtsdL1ktSw= =98Xp -----END PGP SIGNATURE----- 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		2013-04-29 13:57:29 -07:00
..
cgroup	cgroups: fix cgroup_event_listener error handling	2013-01-08 10:00:44 -08:00
firewire	tools/firewire: nosy-dump: check for allocation failure	2012-12-02 20:10:18 +01:00
hv	Tools: hv: Fix a checkpatch warning	2013-04-24 09:02:36 -07:00
include/tools	tools/include: Add byteshift headers for endian access	2012-02-28 10:22:51 -08:00
lguest	tools/lguest: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:40:03 -08:00
lib/traceevent	libtraceevent: Remove hard coded include to /usr/local/include in Makefile	2013-03-13 17:00:00 -03:00
nfsd	NFSD: Added fault injection script	2011-11-07 21:10:47 -05:00
perf	perf/urgent fixes:	2013-03-18 10:00:56 +01:00
power	tools/power turbostat: additional Haswell CPU-id	2013-03-15 11:05:26 -04:00
scripts	tools: Pass the target in descend	2012-11-19 22:10:36 +00:00
testing	A couple of fixes to handle a config file that tests multiple machines	2013-04-29 13:57:29 -07:00
usb	tools: usb: ffs-test: Fix build failure	2013-03-07 12:23:17 +08:00
virtio	Some nice cleanups, and even a patch my wife did as a "live" demo for	2012-12-20 08:37:05 -08:00
vm	tools/vm: add .gitignore to ignore built binaries	2013-02-05 20:38:46 +11:00
Makefile	Merge branch 'for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup	2013-02-20 09:16:21 -08:00