David S. Miller 28b4d5cc17 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/net/pcmcia/fmvj18x_cs.c
	drivers/net/pcmcia/nmclan_cs.c
	drivers/net/pcmcia/xirc2ps_cs.c
	drivers/net/wireless/ray_cs.c

2009-12-05 15:22:26 -08:00

..

acpi

ACPI: remove acpi_device_uid() and related stuff

2009-09-25 15:09:49 -04:00

asm-generic

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

2009-11-18 22:19:03 -08:00

crypto

…

drm

Merge branch 'drm-next' of ../drm-next into drm-linus

2009-10-08 14:03:05 +10:00

keys

…

linux

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-12-05 15:22:26 -08:00

math-emu

…

media

…

mtd

…

net

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2009-12-04 13:25:15 -08:00

pcmcia

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2009-12-05 09:42:59 -08:00

rdma

…

rxrpc

…

scsi

[SCSI] fix async scan add/remove race resulting in an oops

2009-11-26 09:43:39 -06:00

sound

…

trace

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

2009-12-05 09:53:36 -08:00

video

…

xen

…

Kbuild

…