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-28 15:58:21 -07:00
2012-07-24 18:11:22 -07:00
2012-07-24 18:11:22 -07:00
2012-07-24 18:11:22 -07:00
2012-03-31 13:31:23 -07:00
2012-03-28 18:30:03 +01:00
2012-03-28 18:30:03 +01:00
2012-03-28 15:09:28 +01:00
2012-01-02 13:04:55 +01:00
2012-03-22 12:55:29 -07:00
2012-01-22 14:50:03 +01:00
2012-07-20 08:58:13 +01:00
2012-03-28 18:30:03 +01:00
2012-03-28 18:30:03 +01:00
2012-03-28 18:30:03 +01:00
2012-03-28 18:30:03 +01:00
2012-02-21 11:40:37 +01:00
2012-03-31 13:31:23 -07:00
2012-07-24 18:11:22 -07:00
2012-01-03 22:54:07 -05:00
2012-05-17 10:08:57 +01:00
2012-01-02 13:04:55 +01:00
2012-03-31 13:31:23 -07:00
2012-03-28 18:30:03 +01:00