Ingo Molnar ca7e0c6120 Merge branch 'linus' into perf/core ... Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c Merge reason: pick up latest fixes, fix the conflict Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-04-08 13:37:18 +02:00
..
acpi	acpi: Support IBM SMBus CMI devices	2010-03-24 14:38:37 +01:00
asm-generic	…
crypto	…
drm	Merge branch 'master' into export-slabh	2010-04-05 11:37:28 +09:00
keys	…
linux	Merge branch 'linus' into perf/core	2010-04-08 13:37:18 +02:00
math-emu	…
media	…
mtd	…
net	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs	2010-04-05 13:42:54 -07:00
pcmcia	pcmcia: use dev_pm_ops for class pcmcia_socket_class	2010-03-24 11:00:11 +01:00
rdma	…
rxrpc	…
scsi	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sound	Merge branch 'fix/asoc' into for-linus	2010-04-07 09:54:41 +02:00
trace	perf: Fetch hot regs from the template caller	2010-04-04 15:23:07 +02:00
video	…
xen	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kbuild	…