Merge "ALSA jack detection support - match upstream kernel" into pi-dev