diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-07 17:28:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-07 17:28:38 -0800 |
| commit | 318c8932ddec5c1c26a4af0f3c053784841c598e (patch) | |
| tree | 601dc97976191b7baa0ba833cd2bda2bf7745b50 /net/rxrpc/misc.c | |
| parent | ea5a9eff96fed8252f3a8c94a84959f981a93cae (diff) | |
| parent | 166ad0e1e2132ff0cda08b94af8301655fcabbcd (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge more fixes from Andrew Morton:
"3 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
kcov: add missing #include <linux/sched.h>
radix tree test suite: fix compilation
zram: restrict add/remove attributes to root only
Diffstat (limited to 'net/rxrpc/misc.c')