diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-17 01:50:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-17 01:50:38 +0200 |
| commit | ce6a01c2d50e1d400cb6d492841f9b1932034fc2 (patch) | |
| tree | 16a8fd6f9250b019daa9afaacb33fe42e2d01a74 /arch/m68k | |
| parent | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | metag: Fix atomic_*_return inline asm constraints (diff) | |
| download | linux-ce6a01c2d50e1d400cb6d492841f9b1932034fc2.tar.xz linux-ce6a01c2d50e1d400cb6d492841f9b1932034fc2.zip | |
Merge tag 'metag-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag
Pull metag architecture updates from James Hogan:
"Three minor fixes:
- removal of stale comment
- fix build for Meta1 when perf events are enabled
- fix inline asm constraint in atomics"
* tag 'metag-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
metag: Fix atomic_*_return inline asm constraints
metag: perf: fix build on Meta1
metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init
Diffstat (limited to 'arch/m68k')
0 files changed, 0 insertions, 0 deletions