mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 08:46:46 +00:00
Merge branch 'fortglx/3.11/time' of git://git.linaro.org/people/jstultz/linux into timers/core
This commit is contained in:
commit
67c120dc33
1 changed files with 4 additions and 0 deletions
4
arch/arm/include/asm/sched_clock.h
Normal file
4
arch/arm/include/asm/sched_clock.h
Normal file
|
@ -0,0 +1,4 @@
|
|||
/* You shouldn't include this file. Use linux/sched_clock.h instead.
|
||||
* Temporary file until all asm/sched_clock.h users are gone
|
||||
*/
|
||||
#include <linux/sched_clock.h>
|
Loading…
Reference in a new issue