| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 7 Oct 2016 19:24:08 +0000 (12:24 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 7 Oct 2016 19:24:08 +0000 (12:24 -0700) |
Pull trivial updates from Jiri Kosina:
"The usual rocket science from the trivial tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
tracing/syscalls: fix multiline in error message text
lib/Kconfig.debug: fix DEBUG_SECTION_MISMATCH description
doc: vfs: fix fadvise() sycall name
x86/entry: spell EBX register correctly in documentation
securityfs: fix securityfs_create_dir comment
irq: Fix typo in tracepoint.xml
"The usual rocket science from the trivial tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
tracing/syscalls: fix multiline in error message text
lib/Kconfig.debug: fix DEBUG_SECTION_MISMATCH description
doc: vfs: fix fadvise() sycall name
x86/entry: spell EBX register correctly in documentation
securityfs: fix securityfs_create_dir comment
irq: Fix typo in tracepoint.xml
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/filesystems/vfs.txt | patch | | diff1 | | diff2 | | blob | history |
| arch/x86/entry/entry_64.S | patch | | diff1 | | diff2 | | blob | history |
| lib/Kconfig.debug | patch | | diff1 | | diff2 | | blob | history |
| security/inode.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/filesystems/vfs.txt
Simple merge
diff --cc arch/x86/entry/entry_64.S
Simple merge
diff --cc lib/Kconfig.debug
Simple merge
diff --cc security/inode.c
Simple merge