SAMMY updates to kernel tree update 12