Ingo Molnar ec5e61aabe Merge branch 'perf/urgent' into perf/core ...

Conflicts:
	arch/x86/kernel/cpu/perf_event.c

Merge reason: Resolve the conflict, pick up fixes

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2010-04-02 19:38:10 +02:00

..

acpi

acpi: Support IBM SMBus CMI devices

2010-03-24 14:38:37 +01:00

asm-generic

dma-mapping: pci: move pci_set_dma_mask and pci_set_consistent_dma_mask to pci-dma-compat.h

2010-03-12 15:52:42 -08:00

crypto

crypto: md5 - Add export support

2010-01-17 21:55:31 +11:00

drm

Merge branch 'radeon-for-airlied' of ../linux-2.6 into drm-linus

2010-03-15 11:08:59 +10:00

keys

RxRPC: Use uX/sX rather than uintX_t/intX_t types

2009-09-16 00:01:13 -07:00

linux

Merge branch 'perf/urgent' into perf/core

2010-04-02 19:38:10 +02:00

math-emu

Fix misspellings of "truly" in comments.

2010-02-04 11:55:45 +01:00

media

Merge branch 'for-next' into for-linus

2010-03-08 16:55:37 +01:00

mtd

Kill jffs2-user.h

2009-06-05 17:31:38 +01:00

net

Bluetooth: Convert debug files to actually use debugfs instead of sysfs

2010-03-21 05:49:35 +01:00

pcmcia

pcmcia: use dev_pm_ops for class pcmcia_socket_class

2010-03-24 11:00:11 +01:00

rdma

Merge branch 'misc' into for-next

2010-03-01 23:52:31 -08:00

rxrpc

…

scsi

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2010-03-18 16:54:31 -07:00

sound

Merge branch 'topic/misc' into for-linus

2010-03-08 09:35:50 +01:00

trace

Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-03-18 16:52:46 -07:00

video

broadsheetfb: support storing waveform

2010-03-12 15:52:34 -08:00

xen

xen: move Xen-testing predicates to common header

2009-11-04 08:47:24 -08:00

Kbuild

[SCSI] FC Pass Thru support

2009-06-12 14:20:05 -05:00