David S. Miller 4a35ecf8bf Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/via-velocity.c
	drivers/net/wireless/iwlwifi/iwl-agn.c

2010-04-06 23:53:30 -07:00

..

acpi

ACPI: processor: export acpi_get_cpuid()

2010-03-14 21:17:18 -04: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

…

keys

…

linux

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-04-06 23:53:30 -07:00

math-emu

…

media

Merge branch 'for-next' into for-linus

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

mtd

…

net

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-04-06 23:53:30 -07:00

pcmcia

…

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

…

Kbuild

…