diff options
| author | Linus Torvalds | 2011-03-21 14:13:48 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2011-03-21 14:13:48 -0700 |
| commit | b52307ca144881bf9ef1c2610b3f1911472eb467 (patch) | |
| tree | d930771ebb591e772446ebc356558f482aa4cc04 /kernel/resource.c | |
| parent | afd8c40431cc9e3b468a506cbf9957ffca3466fe (diff) | |
| parent | 2d01b26a1b14ab248f850d858f2ff3de3ead6d33 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest:
ktest: Add STOP_TEST_AFTER to stop the test after a period of time
ktest: Monitor kernel while running of user tests
ktest: Fix bug where the test would not end after failure
ktest: Add BISECT_FILES to run git bisect on paths
ktest: Add BISECT_SKIP
ktest: Add manual bisect
ktest: Handle kernels before make oldnoconfig
ktest: Start failure timeout on panic too
ktest: Print logfile name on failure
Diffstat (limited to 'kernel/resource.c')
0 files changed, 0 insertions, 0 deletions