Jeff Garzik 8407884dd9 Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
Two bits were appended to the end of the bitfield
list in struct scsi_device.  Resolve that conflict
by including both bits.

Conflicts:
	include/scsi/scsi_device.h
2012-07-25 15:58:48 -04:00
..
2012-03-22 12:55:29 -07:00
2012-02-19 08:08:58 -06:00
2012-05-23 09:40:09 +01:00
2009-12-30 12:23:27 -08:00
2009-03-12 12:58:06 -05:00
2007-10-12 14:51:56 -04:00
2006-04-14 15:47:45 -05:00
2007-10-12 14:37:50 -04:00
2005-04-16 15:20:36 -07:00
2010-03-12 15:53:10 -08:00