Skip to content

please merge #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
markewebber wants to merge 13 commits into
base: cm-13.0
Choose a base branch
from
Open

please merge #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0372662
Fix MSM_AVTIMER breakage
fat-tire Jan 15, 2016
a205fa1
Enable CPUSETS/MSM_AVTIMER
fat-tire Jan 15, 2016
51f6d5c
cpuset: Add allow_attach hook for cpusets on android.
riandrews Jun 6, 2015
e52da7b
cpuset: Make cpusets restore on hotplug
riandrews Jun 12, 2015
8bc12a0
Remove unneeded obj files
fat-tire Jan 15, 2016
cebf8ce
KEYS: Fix keyring ref leak in join_session_keyring()
Jan 11, 2016
42768c1
update wacom drivers from Linux 3.14.58
fat-tire Jan 20, 2016
832469c
Update cpu.c to keep CPU cores 0 and 1 always on
agsola Jan 28, 2016
9411a73
Merge pull request #1 from agsola/cm-13.0
fat-tire Jan 28, 2016
ae96dd9
Revert "Update cpu.c to keep CPU cores 0 and 1 always on"
niv71 Mar 10, 2016
0663661
pipe: iovec: Fix memory corruption when retrying atomic copy as non-a…
bwhacks Jun 16, 2015
f0e6842
trlte: fix CROSS_COMPILE
dcd May 5, 2016
e839b7b
ashmem: Validate ashmem memory with fops pointer
Jun 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,8 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
# "make" in the configured kernel build directory always uses that.
# Default value for CROSS_COMPILE is not to prefix executables
# Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
ARCH ?=arm
CROSS_COMPILE = ../PLATFORM/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8/bin/arm-eabi-

ARCH ?= $(SUBARCH)
CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)

# Architecture as present in compile.h
UTS_MACHINE := $(ARCH)
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/configs/apq8084_sec_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_IKCONFIG_PROC is not set
CONFIG_CGROUPS=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CPUSETS=y
CONFIG_MSM_AVTIMER=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_SCHED=y
Expand Down
1 change: 0 additions & 1 deletion drivers/input/tablet/acecad.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/usb/input.h>

/*
Expand Down
1 change: 0 additions & 1 deletion drivers/input/tablet/aiptek.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/usb/input.h>
#include <asm/uaccess.h>
#include <asm/unaligned.h>
Expand Down
1 change: 0 additions & 1 deletion drivers/input/tablet/gtco.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ Scott Hill shill@gtcocalcomp.com
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/input.h>
#include <linux/usb.h>
Expand Down
1 change: 0 additions & 1 deletion drivers/input/tablet/hanwang.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/usb/input.h>

#define DRIVER_AUTHOR "Xing Wei <weixing@hanwang.com.cn>"
Expand Down
1 change: 0 additions & 1 deletion drivers/input/tablet/kbtab.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/usb/input.h>
#include <asm/unaligned.h>

Expand Down
1 change: 0 additions & 1 deletion drivers/input/tablet/wacom.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/init.h>
#include <linux/usb/input.h>
#include <linux/power_supply.h>
#include <asm/unaligned.h>
Expand Down
Loading