Commit 1d508e23 authored by Alex Shi's avatar Alex Shi
Browse files

Merge remote-tracking branch 'lts/linux-4.1.y' into linux-linaro-lsk-v4.1 

 Conflicts:
	pick up 45d1abd9 arm64: Use PoU cache instr for I/D coherency
	in arch/arm64/mm/flush.c
parents 439863d9 5880876e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment