Commit 213d6fcf authored Oct 25, 2018 by Ashwini Muduganti

Merge 85403480 on remote branch



Conflicts:
	include/linux/cpu.h
	kernel/stop_machine.c

Change-Id: I638f7cf70e4b6b71a6a11bf6486d47a0d0fcc4af
Signed-off-by: Ashwini Muduganti <amudug@codeaurora.org>

parents ef6d453f 6a2de27b

Show whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment