diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-06 18:16:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-06 18:16:20 -0800 |
| commit | 10f837e52b57bd69b811aeeb8fb1a095e26f6575 (patch) | |
| tree | 6d51afeec0e4dd76b6263a23689a2ec98ac355a8 /fs/proc | |
| parent | dd53a4214d4ff450b66ca7d2e51d9369e3266ebf (diff) | |
| parent | 65323ee1ab528c9c169f671944ac51896f507428 (diff) | |
| download | linux-next-10f837e52b57bd69b811aeeb8fb1a095e26f6575.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fixes from Greg Ungerer:
"There are two fixes here. One to add a missing linker section to the
m68k architecture linker scripts, the other to fix a defconfig build
problem"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k/defconfig: fix stmark2 broken local compilation
m68k: add missing SOFTIRQENTRY_TEXT linker section
Diffstat (limited to 'fs/proc')
0 files changed, 0 insertions, 0 deletions