tree 8ddde1e04060bd65ca2aafb09b38066cb7d69b4d
parent a9037430c6c784165a940a90bcd29f886834c8e7
parent 6f16eebe1ff82176339a0439c98ebec9768b0ee2
author Thomas Gleixner <tglx@linutronix.de> 1359972183 +0100
committer Thomas Gleixner <tglx@linutronix.de> 1359972183 +0100

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: Thomas Gleixner <tglx@linutronix.de>