summaryrefslogtreecommitdiffstats
path: root/include/linux/time.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2012-11-21 20:31:52 +0100
committerThomas Gleixner <tglx@linutronix.de>2012-11-21 20:31:52 +0100
commit9c3f9e281697d02889c3b08922f3b30be75f56c2 (patch)
treee9f3d68e0019a47b982e2b8644f70eb66a3eff3c /include/linux/time.h
parentb8f61116c1ce342804a0897b0a80eb4df5f19453 (diff)
parentd6ad418763888f617ac5b4849823e4cd670df1dd (diff)
downloadlinux-stable-9c3f9e281697d02889c3b08922f3b30be75f56c2.tar.gz
linux-stable-9c3f9e281697d02889c3b08922f3b30be75f56c2.tar.bz2
linux-stable-9c3f9e281697d02889c3b08922f3b30be75f56c2.zip
Merge branch 'fortglx/3.8/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Fix trivial conflicts in: kernel/time/tick-sched.c Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/time.h')
0 files changed, 0 insertions, 0 deletions