summaryrefslogtreecommitdiff
path: root/drivers/scsi/scsi_sysfs.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-10-25 07:19:59 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-10-25 07:19:59 (GMT)
commitbdf4e9482360a3ddc1619efbd5d1c928ede8c3fa (patch)
treeb02319e809c5b8abfca85409a11472775e27f597 /drivers/scsi/scsi_sysfs.c
parent06afb1a087d49ae0f676b2e5b9ffe5f4b3aba355 (diff)
parenteb0474544bc16a9dab53b26abd846e86ba814eb1 (diff)
downloadlinux-fsl-qoriq-bdf4e9482360a3ddc1619efbd5d1c928ede8c3fa.tar.xz
Merge branch 'misc' into for-linus
Conflicts: arch/arm/mach-integrator/integrator_ap.c
Diffstat (limited to 'drivers/scsi/scsi_sysfs.c')
0 files changed, 0 insertions, 0 deletions