Commit c6d372b4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by QuIC Gerrit Code Review
Browse files

Merge changes I16f522e7,Ifa5b3bc2 into msm-3.0 

* changes:
  Merge branch 'google-android' into msm-3.0
  locking, kprobes: Annotate the hash locks and kretprobe.lock as raw
parents 880a9226 d4e3d523
Expand all 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