Martin Schwidefsky 612ef28a04 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		2011-12-19 19:23:15 +01:00
..
acpi	…
asm-generic	[S390] cputime: add sparse checking and cleanup	2011-12-15 14:56:19 +01:00
crypto	…
drm	drm/radeon/kms: add some new pci ids	2011-12-14 12:29:03 +00:00
keys	…
linux	Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip	2011-12-19 19:23:15 +01:00
math-emu	…
media	…
misc	…
mtd	…
net	sch_red: fix red_calc_qavg_from_idle_time	2011-11-30 23:27:22 -05:00
pcmcia	…
rdma	…
rxrpc	…
scsi	…
sound	…
target	target: remove the unused se_dev_list	2011-12-06 06:00:57 +00:00
trace	events, sched: Add tracepoint for accounting blocked time	2011-12-06 08:51:23 +01:00
video	…
xen	…
Kbuild	…