diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 10:13:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 10:13:47 -0700 |
| commit | 6977b4c7736e8809b7959c66875a16c0bbcf2152 (patch) | |
| tree | 4063167be935320f13c56f4495af1d05312cfff8 /include/linux/stackprotector.h | |
| parent | Merge tag 'localmodconfig-v3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig (diff) | |
| parent | ktest: Fix ELSE IF statements (diff) | |
Merge tag 'ktest-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest
Pull ktest fix from Steven Rostedt:
"ktest has one fix needed for this merge window - fix parsing of ELSE
IF in reading config file"
* tag 'ktest-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
ktest: Fix ELSE IF statements
Diffstat (limited to 'include/linux/stackprotector.h')
0 files changed, 0 insertions, 0 deletions