nathanchance/stable-patches

Conflict resolutions for linux-stable merges

Shell