Thomas Gleixner 303c146df1 Merge branch 'timers/urgent' into timers/core ... Pick up urgent bug fix and resolve the conflict. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>		2018-01-27 15:35:29 +01: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	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
nvdimm	libnvdimm for 4.15	2017-11-17 09:51:57 -08:00
radix-tree	mm, truncate: do not check mapping for every page being truncated	2017-11-15 18:21:06 -08:00
scatterlist	tools/testing/scatterlist: Test new __sg_alloc_table_from_pages	2017-09-07 10:54:40 +01:00
selftests	Merge branch 'timers/urgent' into timers/core	2018-01-27 15:35:29 +01:00
vsock	VSOCK: add tools/testing/vsock/vsock_diag_test	2017-10-05 18:44:17 -07:00