diff options
| author |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-12-19 19:23:15 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-12-19 19:23:15 +0100 |
| commit | 612ef28a045efadb3a98d4492ead7806a146485d (patch) | |
| tree | 05621c87b37e91c27b06d450d76adffe97ce9666 /fs/jbd2/commit.c | |
| parent | [S390] fix cputime overflow in uptime_proc_show (diff) | |
| parent | sched: Add missing rcu_dereference() around ->real_parent usage (diff) | |
| download | linux-rng-612ef28a045efadb3a98d4492ead7806a146485d.tar.xz linux-rng-612ef28a045efadb3a98d4492ead7806a146485d.zip | |
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip
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
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions