second change by AK
Merge branch 'master' of https://github.com/cnberry/kernel_1