Merge pull request #6 from javelinanddart/kk-devel5

Add intellimm governor, tuned for ville, and choose as default
Post pull request intellithermal fixup for Ville
USB: gadget: qdss: Fix strncmp length usage

Using a newer GCC we get the following warnings:

drivers/usb/gadget/f_qdss.c: In function 'qdss_bind_config':
drivers/usb/gadget/f_qdss.c:598: warning: argument to 'sizeof' in
'strncmp' call is the same expression as the second source; did you mean
to provide an explicit length? [-Wsizeof-pointer-memaccess]

drivers/usb/gadget/f_qdss.c: In function 'usb_qdss_open':
drivers/usb/gadget/f_qdss.c:760: warning: argument to 'sizeof' in
'strncmp' call is the same expression as the second source; did you mean
to provide an explicit length? [-Wsizeof-pointer-memaccess]

These look to be due to using sizeof(ch->name) which is a pointer, use
a simple strcmp instead.

Change-Id: I09e09a18ffb3361fc351b177ed3a35432d9ed933
Signed-off-by: Kumar Gala <galak@codeaurora.org>
bluetooth: hci_conn: Fix sizeof usage

Change-Id: I3b719e67b8eb2dca3ee8e8980d44ff90d2abcfad
msm: msm_fb: delete cabc/sre update timers on power down

Change-Id: I2b670e2bf225d54ee999ec43007d0abb998fcb1b
defconfig: reset ondemand as default gov... But it doesnt make much of
a difference either way as kernel defaults to ondemand even when
other govs are selected... its a CM issue that needs to be looked at.
Merge remote-tracking branch 'upstream11/cm-11.0' into kk-devel5

Conflicts:
	net/bluetooth/hci_conn.c
defconfig:version bump