Ingo Molnar
c1ab9cab75
Merge branch 'linus' into tracing/core
Conflicts:
include/linux/module.h
kernel/module.c
Semantic conflict:
include/trace/events/module.h
Merge reason: Resolve the conflict with upstream commit 5fbfb18 ("Fix up
possibly racy module refcounting")
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
2010-04-08 10:18:47 +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
|
|
|
|
drm
|
Merge branch 'master' into export-slabh
|
2010-04-05 11:37:28 +09:00 |
|
keys
|
|
|
|
linux
|
Merge branch 'linus' into tracing/core
|
2010-04-08 10:18:47 +02:00 |
|
math-emu
|
|
|
|
media
|
Merge branch 'for-next' into for-linus
|
2010-03-08 16:55:37 +01:00 |
|
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
|
Merge branch 'linus' into tracing/core
|
2010-04-08 10:18:47 +02:00 |
|
video
|
broadsheetfb: support storing waveform
|
2010-03-12 15:52:34 -08:00 |
|
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
|
|
|