git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 07b5d61 f611671)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 8 Nov 2011 02:08:06 +0000 (13:08 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 8 Nov 2011 02:08:06 +0000 (13:08 +1100)
commit	9add83495b1143d813337dab91b573cb6184d4a2
tree	1ad148891aa1e5f3375293b60a17a9a400e90996	tree \| snapshot
parent	07b5d61c35b275862279fe3cf4a97da63ec3f2f6	commit \| diff
parent	f6116715d1bae43e37207ec9c9a8fa7185e6586c	commit \| diff

Merge remote-tracking branch 'cputime/cputime'

Conflicts:
fs/proc/stat.c
include/asm-generic/cputime.h
kernel/sched_stats.h

14 files changed:

drivers/cpufreq/cpufreq_conservative.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_ondemand.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
fs/proc/stat.c	diff1 \|	diff2 \|	blob \| history
include/asm-generic/cputime.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/cpu.c	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/posix-cpu-timers.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sched_stats.h	diff1 \|	diff2 \|	blob \| history
kernel/signal.c	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules