git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dc843ef
79855d1
)
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
author
James Bottomley
<JBottomley@Parallels.com>
Mon, 8 Dec 2014 15:42:02 +0000
(07:42 -0800)
committer
James Bottomley
<JBottomley@Parallels.com>
Mon, 8 Dec 2014 15:42:25 +0000
(07:42 -0800)
Conflicts:
drivers/scsi/scsi_debug.c
Agreed and tested resolution to a merge problem between a fix in scsi_debug
and a driver update
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff