Linus Torvalds 0e396ee43e Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git ... This is a fixed-up version of the broken "upstream-2.6.13" branch, where I re-did the manual merge of drivers/net/r8169.c by hand, and made sure the history is all good.		2005-06-18 11:42:35 -07:00
..
acorn
acpi
atm
base
block	merge by hand (fix up qla_os.c merge error)	2005-06-17 18:42:23 -05:00
bluetooth
cdrom
char	Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2005-06-10 20:23:21 -07:00
cpufreq
crypto
dio
eisa
fc4	[SCSI] allow sleeping in ->eh_host_reset_handler()	2005-06-17 12:05:18 -05:00
firmware
i2c
ide
ieee1394	merge by hand (fix up qla_os.c merge error)	2005-06-17 18:42:23 -05:00
infiniband
input	[PATCH] ALPS: fix enabling hardware tapping	2005-06-16 09:02:59 -07:00
isdn
macintosh	[PATCH] ppc32: Fix nasty sleep/wakeup problem	2005-06-09 21:33:35 -07:00
mca
md	[PATCH] dm: Handle READA requests in dm-mpath.c	2005-06-08 16:21:14 -07:00
media
message	merge by hand (fix up qla_os.c merge error)	2005-06-17 18:42:23 -05:00
misc
mmc
mtd
net	Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git	2005-06-18 11:42:35 -07:00
nubus
oprofile
parisc
parport
pci	[PATCH] PCI: don't override drv->shutdown unconditionally	2005-06-17 12:34:20 -07:00
pcmcia
pnp
s390	merge by hand (fix up qla_os.c merge error)	2005-06-17 18:42:23 -05:00
sbus
scsi	[SCSI] aacraid: regression fix	2005-06-17 20:36:28 -05:00
serial	[PATCH] Serial: remove unused variable in sa1100 driver	2005-06-08 19:26:47 +01:00
sh
sn
tc
telephony
usb	merge by hand (fix up qla_os.c merge error)	2005-06-17 18:42:23 -05:00
video	[PATCH] macmodes: needs a license	2005-06-14 07:19:35 -07:00
w1
zorro
Kconfig
Makefile