]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fd4db34 30083bc)
Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into...
authorThomas Gleixner <tglx@linutronix.de>
Mon, 4 Feb 2013 10:03:03 +0000 (11:03 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 4 Feb 2013 10:03:03 +0000 (11:03 +0100)
commit40056122d11471cd15f4f414a49f948453b830e3
tree8ddde1e04060bd65ca2aafb09b38066cb7d69b4dtree | snapshot
parentfd4db34b3c134fec83559b189dea67445d1f02f1commit | diff
parent30083bcdbd6bd1f6d12f50762d2a22a12d2f6fa1commit | diff
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>
MAINTAINERS diff1 | diff2 | blob | history
arch/powerpc/kernel/time.c diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/kernel/tsc.c diff1 | diff2 | blob | history
drivers/rtc/Kconfig diff1 | diff2 | blob | history
drivers/rtc/Makefile diff1 | diff2 | blob | history
drivers/rtc/class.c diff1 | diff2 | blob | history
fs/pstore/ram.c diff1 | diff2 | blob | history
kernel/time/Kconfig diff1 | diff2 | blob | history
kernel/time/timekeeping.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.