diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-02 09:08:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-02 09:08:26 -0700 |
commit | 54dce3c35bbbeaab8de4b82d3ef3a2f011229662 (patch) | |
tree | d18c5358a9ee9344ac5350e3315d8822464c7698 /net | |
parent | 320b164abb32db876866a4ff8c2cb710524ac6ea (diff) | |
parent | 5ad751053704df3f00d2bb2dc9345c697c212150 (diff) |
Merge branch 'core-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull misc core updates from Ingo Molnar:
"Two changes:
- add membarriers to Documentation/features/
- fix a minor nit in panic printk formatting"
* 'core-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
panic: Add closing panic marker parenthesis
Documentation/features, membarriers: Document membarrier-sync-core architecture support
Documentation/features: Allow comments in arch features files
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions