Manual merge of minor syntax clash
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 2 May 2002 10:18:51 +0000 (03:18 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 2 May 2002 10:18:51 +0000 (03:18 -0700)
commitf4f8a039a1d79a34263c2cbad2c99ade4f82c5b4
tree4e63e08adc1d8e13d8cd45085384197f45422bf1
parentdc0a81a9ebf56eb7cc11aa5f59318ac9ecff2578
parent4f70b4166ad4a1933f0d279eb9993be701518a9b
Manual merge of minor syntax clash
drivers/scsi/sd.c