linux upstream 3.0.79 plus various clean ups
various fix ups