diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 15:41:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 15:41:10 -0800 |
| commit | 98393b8ff2ca98b5b984e73a291b81b326e25184 (patch) | |
| tree | eebde91713a68c633a322cce66821b67c434d4b9 /net/nonet.c | |
| parent | 3b7546211d53f600e15ca7867adbf3c085b8ecc9 (diff) | |
| parent | 815e2bd7d609da9c7615ea28a3990064a394312f (diff) | |
| download | linux-98393b8ff2ca98b5b984e73a291b81b326e25184.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest: (21 commits)
ktest: Evaluate variables entered on the command line
ktest: Add variable ${PWD}
ktest: Add another monitor flush before installing kernel
ktest: Do not opencode reboot in grub setting
ktest: Add processing of complex conditionals
ktest: Fix parsing of config section lines
ktest: Sort make_min_config configs by dependecies
ktest: Add DEFINED keyword for IF statements
ktest: Add OVERRIDE keyword to DEFAULTS section
ktest: Consolidate TEST_TYPE and DEFAULT code
ktest: Add INCLUDE keyword to include other config files
ktest: Let IF keyword take comparisons
ktest: Add IF and ELSE to config sections
ktest: Do not reboot on config or build issues
ktest: Add option REBOOT_SUCCESS_LINE to stop waiting after a reboot
ktest: Add NO_INSTALL option to not install for a test
ktest: Fail when grub menu not found
ktest: Include monitor in reboot code
ktest: Only need to save .config when doing mrproper
ktest: Create outputdir if it does not exist
...
Diffstat (limited to 'net/nonet.c')
0 files changed, 0 insertions, 0 deletions