Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.326' of git://codeaurora.org/kernel/msm into cm-10.1-dev

AU_LINUX_ANDROID_JB_2.5.04.02.02.040.326 based on quic/aosp/jb_2.5

Conflicts:
	arch/arm/mach-msm/msm_watchdog.c
	drivers/char/diag/diagfwd.c
	drivers/power/pm8921-bms.c
	drivers/power/pm8921-charger.c
	drivers/usb/gadget/f_diag.c
	drivers/usb/otg/msm_otg.c
	drivers/video/msm/mdp4.h
	include/media/msm_camera.h