PATCH: Merge Linux Upstream 3.4.21 into local branch i9505-lat1