[SCSI] Merge branch 'linus'
Conflicts:
drivers/message/fusion/mptsas.c
fixed up conflict between req->data_len accessors and mptsas driver updates.
Signed-off-by:
James Bottomley <James.Bottomley@HansenPartnership.com>
No related branches found
No related tags found
Showing
- Documentation/ABI/testing/sysfs-block 59 additions, 0 deletionsDocumentation/ABI/testing/sysfs-block
- Documentation/ABI/testing/sysfs-bus-pci-devices-cciss 33 additions, 0 deletionsDocumentation/ABI/testing/sysfs-bus-pci-devices-cciss
- Documentation/ABI/testing/sysfs-devices-cache_disable 18 additions, 0 deletionsDocumentation/ABI/testing/sysfs-devices-cache_disable
- Documentation/DMA-API.txt 12 additions, 0 deletionsDocumentation/DMA-API.txt
- Documentation/DocBook/Makefile 2 additions, 1 deletionDocumentation/DocBook/Makefile
- Documentation/DocBook/tracepoint.tmpl 89 additions, 0 deletionsDocumentation/DocBook/tracepoint.tmpl
- Documentation/RCU/trace.txt 80 additions, 22 deletionsDocumentation/RCU/trace.txt
- Documentation/Smack.txt 18 additions, 2 deletionsDocumentation/Smack.txt
- Documentation/block/biodoc.txt 1 addition, 1 deletionDocumentation/block/biodoc.txt
- Documentation/filesystems/gfs2-glocks.txt 1 addition, 1 deletionDocumentation/filesystems/gfs2-glocks.txt
- Documentation/filesystems/gfs2.txt 11 additions, 8 deletionsDocumentation/filesystems/gfs2.txt
- Documentation/filesystems/tmpfs.txt 1 addition, 1 deletionDocumentation/filesystems/tmpfs.txt
- Documentation/futex-requeue-pi.txt 131 additions, 0 deletionsDocumentation/futex-requeue-pi.txt
- Documentation/hwmon/sysfs-interface 6 additions, 0 deletionsDocumentation/hwmon/sysfs-interface
- Documentation/input/multi-touch-protocol.txt 79 additions, 24 deletionsDocumentation/input/multi-touch-protocol.txt
- Documentation/kernel-parameters.txt 47 additions, 17 deletionsDocumentation/kernel-parameters.txt
- Documentation/kmemleak.txt 142 additions, 0 deletionsDocumentation/kmemleak.txt
- Documentation/memory-barriers.txt 128 additions, 1 deletionDocumentation/memory-barriers.txt
- Documentation/networking/ip-sysctl.txt 12 additions, 3 deletionsDocumentation/networking/ip-sysctl.txt
- Documentation/scheduler/sched-rt-group.txt 19 additions, 1 deletionDocumentation/scheduler/sched-rt-group.txt
Loading
Please register or sign in to comment