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	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2011-11-07 10:13:52 -08:00
asm-generic	[S390] cputime: add sparse checking and cleanup	2011-12-15 14:56:19 +01:00
crypto	crypto: Add a report function pointer to crypto_type	2011-10-21 14:24:03 +02:00
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	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
misc	[media] altera-stapl: it is time to move out from staging	2011-09-23 15:00:57 -03:00
mtd	mtd: kill old field for `struct mtd_info_user'	2011-09-11 15:57:44 +03:00
net	sch_red: fix red_calc_qavg_from_idle_time	2011-11-30 23:27:22 -05:00
pcmcia	pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3	2011-08-08 16:04:11 -04:00
rdma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2011-11-01 10:51:38 -07:00
rxrpc	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-10-28 16:44:18 -07:00
sound	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
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	ARM: OMAP: HWMOD: Unify DSS resets for OMAPs	2011-11-08 03:16:13 -07:00
xen	xen: Remove hanging references to CONFIG_XEN_PLATFORM_PCI	2011-11-16 12:13:42 -05:00
Kbuild