drivers/usb/gadget/Makefile: -Wno-sizeof-pointer-memaccess for android.c
net/bluetooth/hci_conn.c: fix warning: argument to 'sizeof' in 'memcpy' call is the same pointer type '__u8 *' as the destination; expected '__u8' or an explicit length [-Wsizeof-pointer-memaccess]
arch/arm/boot/compressed/Makefile: fixed error unknown CPU architecture
Makefile: adding config variable for Os/O2/O3 compilation

Conflicts:

	init/Kconfig

Conflicts:

	init/Kconfig
defconfig: add options for optimization level
defconfig: compile at -02
drivers/net/phy/phy.c : fix array out of bounds warning
net/ipv4/tcp_input.c : fix array out of bounds warning
kernel/workqueue.c : fix array out of bounds warning
Fix frame warning for gpu localy instead of globaly
Merge branch 'cm-11.0' of github.com:CyanogenMod/android_kernel_htc_msm8960 into kk-devel
Merge branch 'cm-11.0' of github.com:CyanogenMod/android_kernel_htc_msm8960 into HEAD
Merge branch 'cm-11.0' of github.com:CyanogenMod/android_kernel_htc_msm8960 into HEAD
add build flags to kill aggressive-loop-optimizations
staging: prima: Allow prima_wlan to be built inside kernel

* Prima needs wcnss to be set up when it loads.
  Therefore use a platform_driver in to notify prima that wcnss is ready.

Change-Id: I6c403f705e9dffa524a2aab54453e50775b45264
ville: Disable module loading.

* Remove deprecated config options

Change-Id: I2a5a1b253b7b4e10eb802cf7eb79c179074754c3
fighter: Disable module loading.

* Remove deprecated config options

Change-Id: I1ad59b8a81b25785a6f9547a245527701b11c7f3
elite: Disable module loading.

* Remove deprecated config options

Change-Id: Ia4281cbe6469537ea927b7c2b020c6f76e1b360f
jet: Disable module loading.

* Remove deprecated config options

Change-Id: I90472b525c68de1e2a6829740b20a7946fe29266
Merge branch 'cm-11.0' of github.com:CyanogenMod/android_kernel_htc_msm8960 into kk-devel