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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2009-09-11 09:38:37 -07:00

drm

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

2009-10-08 14:03:05 +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 'master' of /home/davem/src/GIT/linux-2.6/

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

math-emu

…

media

V4L/DVB (13019): video: initial support for ADV7180

2009-09-19 00:53:39 -03:00

mtd

Kill jffs2-user.h

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

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

trivial: fix typo "to to" in multiple files

2009-09-21 15:14:55 +02:00

rxrpc

…

scsi

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

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

sound

Merge branch 'topic/ymfpci' into for-linus

2009-09-10 15:33:09 +02:00

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

davinci-fb-frame-buffer-driver-for-ti-da8xx-omap-l1xx-v4

2009-09-23 07:39:51 -07:00

xen

Merge branches 'for-linus/xen/dev-evtchn', 'for-linus/xen/xenbus', 'for-linus/xen/xenfs' and 'for-linus/xen/sys-hypervisor' into for-linus/xen/master

2009-03-30 10:00:45 -07:00

Kbuild

[SCSI] FC Pass Thru support

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