invisiblek

<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2009 The Android Open Source Project

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software

invisiblek

On branch caf
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   arch/arm/boot/Makefile
	modified:   arch/arm/boot/dts/msm8226-e7lte_att_us/msm8226-e7lte-camera.dtsi
	modified:   arch/arm/boot/dts/msm8226-e7lte_att_us/msm8226-e7lte-misc.dtsi
	modified:   arch/arm/boot/dts/msm8226-e7lte_att_us/msm8226-e7lte-pm.dtsi
	modified:   arch/arm/boot/dts/msm8226-e7lte_att_us/msm8226-e7lte-sensor.dtsi

invisiblek

diff --git a/drivers/thermal/qpnp-adc-tm.c b/drivers/thermal/qpnp-adc-tm.c
index eb647fa..8a3f6a3 100644
--- a/drivers/thermal/qpnp-adc-tm.c
+++ b/drivers/thermal/qpnp-adc-tm.c
@@ -209,6 +209,7 @@ struct qpnp_adc_tm_chip {
 	struct work_struct		trigger_high_thr_work;
 	struct work_struct		trigger_low_thr_work;
 	struct qpnp_adc_tm_sensor	sensor[0];
+	bool                            usb_id_ext_pull_up;
 };

invisiblek

diff --git a/drivers/thermal/qpnp-adc-tm.c b/drivers/thermal/qpnp-adc-tm.c
index eb647fa..8a3f6a3 100644
--- a/drivers/thermal/qpnp-adc-tm.c
+++ b/drivers/thermal/qpnp-adc-tm.c
@@ -209,6 +209,7 @@ struct qpnp_adc_tm_chip {
 	struct work_struct		trigger_high_thr_work;
 	struct work_struct		trigger_low_thr_work;
 	struct qpnp_adc_tm_sensor	sensor[0];
+	bool                            usb_id_ext_pull_up;
 };

invisiblek

  <project name="TheMuppets/proprietary_vendor_lge" path="vendor/lge" revision="cm-12.0" />
  <project name="CyanogenMod/android_device_lge_g2-common" path="device/lge/g2-common" revision="cm-12.0" />
  <project name="CyanogenMod/android_kernel_lge_msm8974" path="kernel/lge/msm8974" revision="cm-12.0" />
  <project name="CyanogenMod/android_device_lge_vs980" path="device/lge/vs980" revision="cm-12.0" />
  <project name="CyanogenMod/android_hardware_samsung" path="hardware/samsung" revision="cm-12.0" />
  <project name="CyanogenMod/android_device_htc_msm8960-common" path="device/htc/msm8960-common" revision="cm-12.0" />
  <project name="CyanogenMod/android_hardware_atheros_wlan" path="hardware/atheros/wlan" revision="cm-12.0" />
  <project name="CyanogenMod/android_device_asus_flo" path="device/asus/flo" revision="cm-12.0" />
  <project name="CyanogenMod/android_kernel_google_msm" path="kernel/google/msm" revision="cm-12.0" />

invisiblek

/system/bin/linker
__cxa_finalize
__cxa_atexit
__aeabi_unwind_cpp_pr0
_ZN9LocApiV029getZppFixER11GpsLocation
__aeabi_unwind_cpp_pr1
get_timestamp
loc_get_v02_event_name
__android_log_print
__stack_chk_fail

invisiblek

update_config=1
eapol_version=1
ap_scan=1
fast_reauth=1
pmf=1

invisiblek

92967 # cm: build: Implement shared library caching
92962 # imgdiff: skip over rest of kernel image after first match for gzip header
92963 # ConnectivityService: add persist.ro.radio.noril
92944 # SurfaceFlinger: Featurize libuiblur module for OSS build
93072 # DCTracker: Ignore setting up apn on legacy CDMA

# otg
skip 88913 # frameworks: add persistent notification when USB OTG is connected

# vzw-specific

invisiblek

diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
index 0984a21..15f60d0 100644
--- a/kernel/sched/auto_group.c
+++ b/kernel/sched/auto_group.c
@@ -143,15 +143,11 @@ autogroup_move_group(struct task_struct *p, struct autogroup *ag)
 
 	p->signal->autogroup = autogroup_kref_get(ag);
 
-	if (!ACCESS_ONCE(sysctl_sched_autogroup_enabled))
-		goto out;

invisiblek

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index c731d4d..5da13d7 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1123,7 +1123,7 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
 	 * a task's CPU. ->pi_lock for waking tasks, rq->lock for runnable tasks.
 	 *
 	 * sched_move_task() holds both and thus holding either pins the cgroup,
-	 * see set_task_rq().
+	 * see task_group().