Commit 193f8aad authored by Guodong Xu's avatar Guodong Xu
Browse files

Merge branch 'working-hikey-tracking-others-v4.4' into working-hikey-mainline-rebase-v4.4-c30 

* working-hikey-tracking-others-v4.4:
  Revert "mmc: block: don't use parameter prefix if built as module"
parents edb1cc70 06a973a2
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