Merge ../linux-2.6/

Conflicts:

	drivers/scsi/aacraid/comminit.c

Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid

Signed-off-by: James Bottomley <[email protected]>
This commit is contained in:
James Bottomley 2006-06-28 14:06:39 -04:00
commit f28e71617d
1119 changed files with 51158 additions and 19353 deletions

View file

@ -12,5 +12,3 @@ http://www.torque.net/parport/
Email list for Linux Parport
[email protected]
Email for problems with ZIP or ZIP Plus drivers
[email protected]