From: Linus Torvalds Date: Sat, 3 Jun 2006 16:12:50 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 X-Git-Tag: v2.6.17-rc6~46 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=672c6108a51bf559d19595d9f8193dfd81f0f752;p=linux-2.6-omap-h63xx.git Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] scsi_lib.c: properly count the number of pages in scsi_req_map_sg() [SCSI] scsi_transport_sas: make write attrs writeable [SCSI] scsi_transport_sas; fix user_scan [SCSI] ppa: fix for machines with highmem [SCSI] mptspi: reset handler shouldn't be called for other bus protocols [SCSI] Blacklist entry for HP dat changer --- 672c6108a51bf559d19595d9f8193dfd81f0f752