Merge branch 'origin' into devel-stable
[pandora-kernel.git] / kernel / time / timekeeping.c
Simple merge