| commit | 8407884dd9164ec18ed2afc00f56b87e36c51fcf | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Wed Jul 25 15:58:48 2012 -0400 |
| committer | Jeff Garzik <jgarzik@redhat.com> | Wed Jul 25 15:58:48 2012 -0400 |
| tree | b6ea42c231d7d39f454de28a068d78ce11709770 | |
| parent | dc7f71f486f4f5fa96f6dcf86833da020cde8a11 [diff] | |
| parent | bdc0077af574800d24318b6945cf2344e8dbb050 [diff] |
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