Skip to content
This repository has been archived by the owner on Jul 3, 2019. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'als/android-msm-marlin-3.18' into pie
Browse files Browse the repository at this point in the history 
Signed-off-by: Nathan Chancellor <[email protected]>
  • Loading branch information
@nathanchance
nathanchance committed Sep 4, 2018
2 parents 7df3b31 + d425114 commit 54ecf37
Show file tree
Hide file tree
Showing 30 changed files with 970 additions and 356 deletions.
2 changes: 1 addition & 1 deletion arch/arm64/configs/marlin_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CONFIG_RCU_FAST_NO_HZ=y
CONFIG_RCU_BOOST=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_CPU_MAX_BUF_SHIFT=15
CONFIG_LOG_CPU_MAX_BUF_SHIFT=18
CONFIG_CGROUPS=y
CONFIG_CGROUP_DEBUG=y
CONFIG_CGROUP_FREEZER=y
Expand Down
Loading

0 comments on commit 54ecf37

Please sign in to comment.