Lets not break things.
Merge branch 'master' of https://github.com/revnull-src/linux-conf