Merge remote-tracking branch 'CA-msm-3.0/jb_2.5' into jb_2.5-207
Merge remote-tracking branch 'CA-msm-3.0/jb_2.5' into jb_2.5-207
M2: mdp: fix header to match caf
M2: Add sound/a2220.h to the headers_install list.

This allows CM to build with this kernel.
M2: vzw: Fix warning

Change-Id: Ia430e3c76b779f5af94c8b9c59b53a16a7779b6c
Merge remote-tracking branch 'remotes/CA-msm-3.0/jb_2.5' into jb_2.5-207

Conflicts:
	drivers/usb/gadget/android.c
	include/media/msm_camera.h
Merge remote-tracking branch 'caf/jb_2.5' into 207-korgtest

Conflicts:
	arch/arm/mach-msm/msm_watchdog.c
Merge commit 'f18a511703b6667edee4703fdd8b73ca18e232a4' into 207-korgtest

Conflicts:
	drivers/usb/host/xhci.h
Merge commit '1f5547c7f183363eabe07e5d202a49f2e94e995a' into 207-korgtest
Merge commit 'a694d36e943f3fff08e19d942d4db819c94401c1' into 207-korgtest
Merge commit 'ff74ae50f01ee67764564815c023c362c87ce18b' into 207-korgtest
Merge commit '763c71b1319c56272e42cf6ada6994131f0193a7' into 207-korgtest

Conflicts:
	drivers/base/power/main.c
Merge commit '1c8f63c2758096c3b6425f4ecb274901151d6f17' into 207-korgtest

Conflicts:
	include/linux/sched.h
Merge commit '0d0eef55e03a76885b5d665b1f5572e1f4975886' into 207-korgtest
Merge commit '8067fa23092f2c4e18c29c90f7d5bb765dbf8954' into 207-korgtest

Conflicts:
	drivers/base/power/main.c
	drivers/mmc/host/sdhci.c
	drivers/net/tun.c
	kernel/power/suspend.c
Merge commit '196ad09b956e63131e3d196e490a4dfbb85e875f' into 207-korgtest

Conflicts:
	arch/arm/mm/tlb-v7.S
	arch/arm/vfp/entry.S
	drivers/usb/core/hub.c
Merge commit 'f95b978981a7d154ba40d14c18e8ed5c694e6124' into 207-korgtest

Conflicts:
	drivers/usb/host/xhci.h
Merge commit '00709f7f01c3a10252f030f0bdacecbb349d7be4' into 207-korgtest

Conflicts:
	arch/arm/mm/tlb-v7.S
	arch/arm/vfp/vfpmodule.c
	net/bluetooth/hci_event.c