block/bfq-iosched.c: GCC 4.8.x compatibility fixup

Signed-off-by: Paul Reioux <reioux@gmail.com>
pm-8x60.c: complaining of power collapse within 1 ms is pointless

since latency for cores is > 10 ms

Signed-off-by: Paul Reioux <reioux@gmail.com>

Conflicts:
	arch/arm/mach-msm/pm-8x60.c
net/bluetooth/hci_conn.c: GCC 4.8.x fix up again

Signed-off-by: Paul Reioux <reioux@gmail.com>
intelliactive: add upstream patches

Signed-off-by: Paul Reioux <reioux@gmail.com>
Revert "cpufreq: force cpu1 policy to match cpu0 when changing freq"

This reverts commit f298016b1e5b61db24c75d11b2ac80f05f7103f3.
Fix MSM-Sleeper