git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6f9aad0 887d9dc)

author	Thomas Gleixner <tglx@linutronix.de>
	Thu, 18 Jun 2015 22:17:47 +0000 (00:17 +0200)
committer	Thomas Gleixner <tglx@linutronix.de>
	Thu, 18 Jun 2015 22:17:47 +0000 (00:17 +0200)
commit	624bbdfac99c50bf03dff9a0023f666b8e965627
tree	431d1345087021736a2ae66b041d2a9593ebf1d3	tree \| snapshot
parent	6f9aad0bc37286c0441b57f0ba8cffee50715426	commit \| diff
parent	887d9dc989eb0154492e41e7c07492edbb088ba1	commit \| diff

Merge branch 'timers/core' into sched/hrtimers

Merge sched/core and timers/core so we can apply the sched balancing
patch queue, which depends on both.

fs/dcache.c	diff1 \|	diff2 \|	blob \| history
kernel/futex.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/deadline.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/rt.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/time/hrtimer.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_api.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.