David S. Miller a2bfbc072e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/can/Kconfig		2009-11-17 00:05:02 -08:00
..
acpi	ACPI: remove acpi_device_uid() and related stuff	2009-09-25 15:09:49 -04:00
asm-generic	net: Generalize socket rx gap / receive queue overflow cmsg	2009-10-12 13:26:31 -07:00
crypto
drm	Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-09-30 08:03:00 -07:00
keys
linux	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-17 00:05:02 -08:00
math-emu
media
mtd
net	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-17 00:05:02 -08:00
pcmcia	PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()	2009-09-29 00:10:41 +02:00
rdma
rxrpc
scsi	trivial: remove unnecessary semicolons	2009-09-21 15:14:58 +02:00
sound
trace	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2009-10-04 12:39:14 -07:00
video	davinci-fb-frame-buffer-driver-for-ti-da8xx-omap-l1xx-v4	2009-09-23 07:39:51 -07:00
xen
Kbuild