diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-18 14:25:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-18 14:25:57 -0800 |
| commit | 8b4414f51d098ca6f9fa3c6b6b31926f3b45d4bc (patch) | |
| tree | b2d955d6a43db368b7d4bdd786b3f3020acee07b /fs/btrfs | |
| parent | 65d70e79cdb96b208c72a30b34525a850ee640cb (diff) | |
| parent | 1d5cda4076d930d6d52088ed2c7753f7c564cbd7 (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"Three patches"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
include/linux/mmdebug.h: should include linux/bug.h
mm/zswap: change incorrect strncmp use to strcmp
proc: fix -ESRCH error when writing to /proc/$pid/coredump_filter
Diffstat (limited to 'fs/btrfs')
0 files changed, 0 insertions, 0 deletions