git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dc7f71f
bdc0077
)
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
author
Jeff Garzik
<jeff@garzik.org>
Wed, 25 Jul 2012 19:58:48 +0000
(15:58 -0400)
committer
Jeff Garzik
<jgarzik@redhat.com>
Wed, 25 Jul 2012 19:58:48 +0000
(15:58 -0400)
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
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff