David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ... All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-20 21:17:12 -07:00
..
fault-injection	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
ktest	These commits have either been sitting in my INBOX or have been	2018-04-11 16:42:27 -07:00
nvdimm	tools/testing/nvdimm: advertise a write cache for nfit_test	2018-06-30 10:45:48 -07:00
radix-tree	idr: fix invalid ptr dereference on item delete	2018-05-25 18:12:10 -07:00
scatterlist
selftests	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
vsock