diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-03 09:12:50 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-03 09:12:50 -0700 |
commit | 672c6108a51bf559d19595d9f8193dfd81f0f752 (patch) | |
tree | d88dc7d2e8acb7e70193cf8bb888cc668d168fc6 /drivers/pcmcia/pd6729.c | |
parent | fb80a6e1a521eb298edb4365429d533dd39427fa (diff) | |
parent | f52359622fa25783cf1a08c0772048d2ed1a7434 (diff) | |
download | talos-obmc-linux-672c6108a51bf559d19595d9f8193dfd81f0f752.tar.gz talos-obmc-linux-672c6108a51bf559d19595d9f8193dfd81f0f752.zip |
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
Diffstat (limited to 'drivers/pcmcia/pd6729.c')
0 files changed, 0 insertions, 0 deletions