Merge branch 'for-linus' into for-linus-3.12
[firefly-linux-kernel-4.4.55.git] / include / asm-generic / vtime.h