Linux 3.0.69

Conflicts:

	drivers/firmware/dmi_scan.c

Change-Id: Iab1985723262ecb197058489630fd72781852aac
Signed-off-by: Matt Filetto <matt.filetto@gmail.com>
switched to PM_FAST (Credit: LeeDroid)

Conflicts:

	drivers/net/wireless/bcm4329_248/dhd_cdc.c
	drivers/net/wireless/bcm4329_248/wl_iw.c

Change-Id: Ie401b458c69c500dd41b3a8838beacfc8669d24a
Signed-off-by: Matt Filetto <matt.filetto@gmail.com>
enabled PM_FAST by default

Conflicts:

	drivers/net/wireless/bcmdhd/dhd_linux.c

Change-Id: I13949d347d745fdb3d428b9db9d29916e7e3526f
Signed-off-by: Matt Filetto <matt.filetto@gmail.com>
Linux 3.0.70

Change-Id: Ia700ce3a283ba34fb2a01cf4bf4749db30127c25

Conflicts:

	drivers/usb/host/ehci-q.c
	drivers/usb/serial/qcaux.c
	tools/perf/util/trace-event-parse.c
Merge pull request #2 from Team-Hydra/cm-10.1

Downstream Changes