Commit ff3317b3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Iff24ac4e,I6cc33568,Icf7ea104,I8451eb55,I7e903748 into pi-dev 

* changes:
  android-4.14: Add CONFIG_MEMCG{,_SWAP} requirement.
  android-4.14: replace CONFIG_DEBUG_RODATA with CONFIG_STRICT_KERNEL_RWX
  android-3.18: Move OABI_COMPAT to base-arm.cfg
  android-4.4: Move OABI_COMPAT to base-arm.cfg
  Remove INET_LRO & move OABI_COMPAT to base-arm.cfg
parents b13395db 5222bad4
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