git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

author	Thomas Gleixner <tglx@linutronix.de>
	Tue, 19 May 2015 14:12:32 +0000 (16:12 +0200)
committer	Thomas Gleixner <tglx@linutronix.de>
	Tue, 19 May 2015 14:12:32 +0000 (16:12 +0200)
commit	c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015
tree	a80672ee82fcc3d9c8d486e53731eb19cd968eb0	tree \| snapshot (tar.gz zip)
parent	daa67b4b70568a07fef3cffacb2055891bf42ddb	commit \| diff
parent	e26081808edadfd257c6c9d81014e3b25e9a6118	commit \| diff

Merge branch 'linus' into timers/core

Make sure the upstream fixes are applied before adding further
modifications.

arch/x86/kernel/cpu/perf_event_intel_rapl.c	diff1 \|	diff2 \|	blob \| history
include/linux/clocksource.h	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
kernel/locking/rtmutex.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history