diff options
| author | Linus Torvalds | 2014-02-25 22:12:19 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-02-25 22:12:19 +0100 |
| commit | c378a6566392789dd7400b13e4d4064cbbb9a087 (patch) | |
| tree | 030ba06ad3528f4ecac4550686dc11762292ec17 /include/linux/sysfs.h | |
| parent | Merge tag 'xtensa-next-20140224' of git://github.com/czankel/xtensa-linux (diff) | |
| parent | m68k: Wire up sched_setattr and sched_getattr (diff) | |
| download | kernel-qcow2-linux-c378a6566392789dd7400b13e4d4064cbbb9a087.tar.gz kernel-qcow2-linux-c378a6566392789dd7400b13e4d4064cbbb9a087.tar.xz kernel-qcow2-linux-c378a6566392789dd7400b13e4d4064cbbb9a087.zip | |
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 'include/linux/sysfs.h')
0 files changed, 0 insertions, 0 deletions