Self-explanatory, really.
The former of the two changes will have to be repeated to hero but I don't have an S7 flat to test, it should be fairly easy to port over (it's what I did for wifi support.)
Also went ahead and updated the downstream kernel since it was available.
