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:
Colin Cross <ccross@android.com>
Change-Id: I1f673ffa338439c6f6f227d67ffff24487e0cedf
Loading
Please sign in to comment