Merge "msm: updating the kernel config entry for avtimer"