mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'master' into for-upstream
Conflicts: Documentation/ABI/testing/sysfs-bus-usb drivers/Makefile
This commit is contained in:
commit
61e0e79ee3
6522 changed files with 533196 additions and 168672 deletions
|
|
@ -103,4 +103,6 @@ source "drivers/auxdisplay/Kconfig"
|
|||
source "drivers/uio/Kconfig"
|
||||
|
||||
source "drivers/xen/Kconfig"
|
||||
|
||||
source "drivers/staging/Kconfig"
|
||||
endmenu
|
||||
|
|
|
|||
Loading…
Reference in a new issue