summaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-04 07:49:07 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-04 07:49:07 -0800
commit559595a985e106d2fa9f0c79b7f5805453fed593 (patch)
tree88758ce2126d1cf240f4f93ea98d52bf1e21ce6c /drivers/scsi
parent5ad8b7d12605e88d1e532061699102797fdefe08 (diff)
parent368a12117dd8abf6eaefa37c21ac313b517128b9 (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Run sbc610 USB fixup code only on the appropriate platform.
Diffstat (limited to 'drivers/scsi')
0 files changed, 0 insertions, 0 deletions