git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0233799 673eac3)

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	7d0de48e88d867fb75602b81310dbac0f522729f
tree	431d1345087021736a2ae66b041d2a9593ebf1d3	tree \| snapshot
parent	0233799b7f5c5c59be22a479815fa3436ebfbe1a	commit \| diff
parent	673eac342b9f2abe3d68d841e982d0e482e14405	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

Linux Kernel Source Tree.