Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b1a9a5e authored Jan 22, 2014 by James Bottomley

Merge branch 'misc' into for-linus

parents dcaf9aed 3ce438df

Documentation/scsi/00-INDEX

+0 −2

Original line number	Diff line number	Diff line
		@@ -42,8 +42,6 @@ aic79xx.txt
		- Adaptec Ultra320 SCSI host adapters
		aic7xxx.txt
		- info on driver for Adaptec controllers
		aic7xxx_old.txt
		- info on driver for Adaptec controllers, old generation
		arcmsr_spec.txt
		- ARECA FIRMWARE SPEC (for IOP331 adapter)
		dc395x.txt

Documentation/scsi/aic7xxx_old.txt

deleted100644 → 0

+0 −511

File deleted.

Preview size limit exceeded, changes collapsed.

Documentation/scsi/scsi_eh.txt

+39 −30

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/scsi/scsi_mid_low_api.txt

+7 −2

File changed.

Preview size limit exceeded, changes collapsed.

MAINTAINERS

+3 −4

File changed.

Preview size limit exceeded, changes collapsed.