prepare for dualboot
more dualboot
final? changes for dualboot
Merge branch 'cm-10.1' into cm-10.1-dualboot
Merge branch 'cm-10.1' into cm-10.1-dualboot
again dualboot tests
disabled coresight
dualboot
dualboot finally working
working dualboot
Merge branch 'linux-3.0.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into cm-10.1-dualboot
Revert "ARM: vfp: Use cpu pm notifiers to save vfp state"

This reverts commit ffb28d3249884ebe01e2516f8f1b4b22c56cd041.
Revert "cpu_pm: Add cpu power management notifiers"

This reverts commit dc8afc7e224be5008a5617f87fb69e25a149ea01.
net: wireless: bcmdhd: Enable P2P probe request handling only during discovery

Change-Id: I2db29d5ed7f66f2a45feb890c81d510fcad24dd2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ipv4: Check if dev_out is NULL in ip_route_output_slow()

Change-Id: If04a8e99942dbe7e099e736dc87c2a49e1e778f9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ipv4: Skip calling fib_detect_death() if fib_dev is NULL

Change-Id: I1b8c6c7e79cb8a05b4b715ddb3299d74edef0e14
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Increase PNO wakelock to 7 sec

Change-Id: Ife7bac08d16e19b37d16f697e4ad9765ca6efbb7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Prevent HT Avail timeout to frozen device while asleep

Change-Id: I6ccd035539a3a3074b7ff1e06854ce396d784fc4
Latest changes from 3.4

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
cpufreq: interactive: fix deadlock on spinlock in timer

Need to use irqsave/restore spinlock calls to avoid a deadlock in calls
from the timer.

Change-Id: I15b6b590045ba1447e34ca7b5ff342723e53a605
Signed-off-by: Todd Poynor <toddpoynor@google.com>