diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-25 13:12:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-25 13:12:19 -0800 |
| commit | c378a6566392789dd7400b13e4d4064cbbb9a087 (patch) | |
| tree | 030ba06ad3528f4ecac4550686dc11762292ec17 /security | |
| parent | bafb81927e13d3eb5e209f5094556336d153a694 (diff) | |
| parent | 7247f55381d54645a1eb47588de51bb26fa7cb7a (diff) | |
| download | linux-c378a6566392789dd7400b13e4d4064cbbb9a087.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k update from Geert Uytterhoeven:
- More barrier.h consolidation
- Sched_[gs]etattr() syscalls
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Wire up sched_setattr and sched_getattr
m68k: Switch to asm-generic/barrier.h
m68k: Sort arch/m68k/include/asm/Kbuild
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions