ck-3.15: merge official test -ck1 patch for Linux 3.15
Merge branch 'ck-3.15' into pf-3.15