Linus Torvalds 91b90475e7 Merge master.kernel.org:/home/rmk/linux-2.6-arm

2005-06-20 11:37:49 -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

[PATCH] ARM: 2701/1: free up ixp2000 timer 4 for the watchdog

2005-06-20 18:51:07 +01:00

cpufreq

…

crypto

…

dio

…

eisa

…

fc4

fc4/fc: fix warnings and errors related to recent SCSI EH updates

2005-06-19 21:47:56 -04: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

…

isdn

…

macintosh

…

mca

…

md

…

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] Fix typo in drivers/pci/pci-driver.c

2005-06-18 12:59:33 -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

aic7xxx/aic79xx_osm: revert completely bogus ahd_linux_queue() patch

2005-06-19 21:50:12 -04:00

serial

…

sh

…

sn

…

tc

…

telephony

…

usb

merge by hand (fix up qla_os.c merge error)

2005-06-17 18:42:23 -05:00

video

…

w1

…

zorro

…

Kconfig

…

Makefile

…