review.tizen.org Git - profile/common/kernel-common.git/commit

projects / profile / common / kernel-common.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a903743 6f16eeb)

author	Thomas Gleixner <tglx@linutronix.de>
	Mon, 4 Feb 2013 10:03:03 +0000 (11:03 +0100)
committer	Thomas Gleixner <tglx@linutronix.de>
	Mon, 4 Feb 2013 10:03:03 +0000 (11:03 +0100)
commit	90889a635a9b5488624bccce3ff6b2eec68c007b
tree	8ddde1e04060bd65ca2aafb09b38066cb7d69b4d	tree \| snapshot
parent	a9037430c6c784165a940a90bcd29f886834c8e7	commit \| diff
parent	6f16eebe1ff82176339a0439c98ebec9768b0ee2	commit \| 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

Domain: SCM / Uncategorized;