Commit a3cad922 authored by Erick Reyes's avatar Erick Reyes
Browse files

Merge branch 'whitechapel' into android-gs-pixel-4.19 



Squash merge at commit:

009f55a77903 drivers: edgetpu: fix Kconfig merge

Change-Id: I47070b186cef2da6aa27f43bab4264c6ad135062
Signed-off-by: default avatarErick Reyes <erickreyes@google.com>
parent 35ff9495
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