Merge branch 'master' of git://github.com/pershoot/kernel-2638 into supersonic