mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge branches 'release' and 'menlo' into release
Conflicts: drivers/acpi/video.c Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
commit
26b6f22366
19 changed files with 2450 additions and 170 deletions
|
|
@ -60,6 +60,8 @@ source "drivers/power/Kconfig"
|
|||
|
||||
source "drivers/hwmon/Kconfig"
|
||||
|
||||
source "drivers/thermal/Kconfig"
|
||||
|
||||
source "drivers/watchdog/Kconfig"
|
||||
|
||||
source "drivers/ssb/Kconfig"
|
||||
|
|
|
|||
Loading…
Reference in a new issue