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-07-24 18:11:22 -07:00
2012-07-22 13:36:52 -07:00
2012-07-23 16:31:31 -07:00
2012-07-19 00:03:17 +02:00
2012-07-23 17:51:03 -07:00
2012-07-23 17:36:02 -07:00
2012-07-16 09:20:33 -07:00
2012-07-24 13:40:06 +02:00
2012-07-24 16:24:11 -07:00
2012-07-04 15:55:19 +08:00
2012-07-15 21:49:21 +01:00
2012-07-24 16:17:07 -07:00
2012-07-09 16:42:24 -04:00
2012-07-24 14:07:22 -07:00
2012-07-24 16:17:07 -07:00
2012-07-24 14:05:46 -07:00
2012-07-22 13:36:52 -07:00
2012-07-24 18:11:22 -07:00
2012-07-24 12:01:20 -07:00
2012-07-24 18:11:22 -07:00
2012-06-21 21:40:40 -06:00
2012-07-24 16:17:07 -07:00