Merge commit 'v2.6.28-rc4' into timers/rtc