Merge remote-tracking branch 'aosp/android-omap-tuna-3.0-jb-mr2' into cm-10.2

Conflicts:
	drivers/net/wireless/bcmdhd/dhd_linux.c

Change-Id: I7653ee173865aa3817106378065af2d192d3f10f