J. Bruce Fields 5306293c9c Merge commit 'v2.6.34-rc6' ...

Conflicts:
	fs/nfsd/nfs4callback.c

2010-05-04 11:29:05 -04: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 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2010-04-19 07:27:06 -07:00

keys

…

linux

Merge commit 'v2.6.34-rc6'

2010-05-04 11:29:05 -04:00

math-emu

…

media

Merge branch 'for-next' into for-linus

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

mtd

…

net

sctp: Fix oops when sending queued ASCONF chunks

2010-04-28 12:16:34 -07:00

pcmcia

pcmcia: pcmcia_dev_present bugfix

2010-04-21 08:09:17 +02:00

rdma

Merge branch 'misc' into for-next

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

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 'for-linus' of git://git.kernel.dk/linux-2.6-block

2010-04-09 11:50:29 -07: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

…