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

Commit f97bd9e5 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'v3.18/topic/coresight' into linux-linaro-lsk-v3.18 

* v3.18/topic/coresight:
  ARM: Kconfig.debug: OC_ETM and CORESIGHT are mutually exclusive
parents ff3b6278 867f900b
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