xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
87caeba7914979ef6a5765dfa3163b51a30133ab
android_kernel_xiaomi_sm8450/include/linux/mlx5/driver.h
David S. Miller 3a3f7d130e Merge https://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Some overlapping changes in the mlx5 driver.

A merge conflict resolution posted by Stephen Rothwell was used as a
guide.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-07-03 03:42:10 -07:00

30 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink