James Bottomley c4e00fac42 Merge ../scsi-misc-2.6 ... Conflicts: drivers/scsi/nsp32.c drivers/scsi/pcmcia/nsp_cs.c Removal of randomness flag conflicts with SA_ -> IRQF_ global replacement. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>		2006-07-03 09:41:12 -05:00
..
acorn
acpi
amba
atm
base
block
bluetooth
cdrom
char
clocksource
connector
cpufreq
crypto
dio
dma
edac
eisa
fc4
firmware
hwmon
i2c
ide
ieee1394
infiniband	Merge ../scsi-misc-2.6	2006-07-03 09:41:12 -05:00
input
isdn
leds
macintosh
mca
md
media
message	Merge ../scsi-misc-2.6	2006-07-03 09:41:12 -05:00
mfd
misc
mmc
mtd
net
nubus
oprofile
parisc
parport
pci
pcmcia
pnp
rapidio
rtc
s390
sbus
scsi	Merge ../scsi-misc-2.6	2006-07-03 09:41:12 -05:00
serial
sh
sn
spi
tc
telephony
usb
video
w1
zorro
Kconfig
Makefile