Merge "panic: Fix a possible deadlock in panic()" into msm-3.4