Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c67d2358 authored by Alex Shi's avatar Alex Shi
Browse files

Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18 

Conflicts:
	include 666eeee7 include/linux/irq.h
	which used for pcie support
parents fe522b17 3cab355c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment