commit from linux
Merge branch 'linux-branch'

some message form linux merge