diff options
| author | Linus Torvalds | 2018-06-24 20:06:42 +0800 |
|---|---|---|
| committer | Linus Torvalds | 2018-06-24 20:06:42 +0800 |
| commit | d3a6749c3364d576e9b8515ccfb14ce57cf3b9b2 (patch) | |
| tree | 2424d46c5152cea8c472974cf0ef719363a80700 /include/pcmcia | |
| parent | d4e860eaf0584dfcc1375e06eeb34f85f43c8d34 (diff) | |
| parent | 8730662d7b2582f65dd6c59ab1e0b7fa461c79b0 (diff) | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Thomas Gleixner:
"Two tiny fixes:
- Add the missing machine_real_restart() to objtools noreturn list so
it stops complaining
- Fix a trivial comment typo"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
kernel.h: Fix a typo in comment
objtool: Add machine_real_restart() to the noreturn list
Diffstat (limited to 'include/pcmcia')
0 files changed, 0 insertions, 0 deletions