diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-01 19:43:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-01 19:43:34 -0700 |
| commit | b821861b905a79f71746945237968c3382d99adc (patch) | |
| tree | 7c3ef4b784c225bbfaaba7b8982ac133880bb650 /fs/nfs/proc.c | |
| parent | 208d501708c4397898fc440ac8cc68537538e39e (diff) | |
| parent | 759a3cc625e77161ae457459489178dd0921524e (diff) | |
Merge tag 'ktest-for-v3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest
Pull two bug fixes in ktest from Steven Rostedt.
* tag 'ktest-for-v3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
ktest: Fix reboot on success stopping all reboots
ktest.pl: Fix combined usage of BISECT_REVERSE and BISECT_SKIP
Diffstat (limited to 'fs/nfs/proc.c')
0 files changed, 0 insertions, 0 deletions