Skip to content
Commit 90889a63 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core 



Trivial conflict in arch/x86/Kconfig

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents a9037430 6f16eebe
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment