Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip

Browse Source

Conflicts:
	drivers/cpufreq/cpufreq_conservative.c
	drivers/cpufreq/cpufreq_ondemand.c
	drivers/macintosh/rack-meter.c
	fs/proc/stat.c
	fs/proc/uptime.c
	kernel/sched/core.c

...

This commit is contained in:

Martin Schwidefsky

2011-12-19 19:23:15 +01:00

parent c3e0ef9a29 07cde2608a

commit 612ef28a04

29 changed files with 2608 additions and 2375 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

8119

kernel/sched/core.c Normal file

File diff suppressed because it is too large Load Diff