Commit 342a0479 authored by Colin Cross's avatar Colin Cross
Browse files

Merge tag 'v3.4.35' into android-3.4



This is the 3.4.35 stable release

Conflicts:
	drivers/base/power/main.c
	drivers/net/tun.c
	kernel/cgroup.c
	kernel/power/suspend.c

Signed-off-by: default avatarColin Cross <ccross@android.com>
Change-Id: I1f673ffa338439c6f6f227d67ffff24487e0cedf
parents 74752baf 2713e279
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment