Merge branch 'dmaengine' into async-tx-next
Conflicts: crypto/async_tx/async_xor.c drivers/dma/ioat/dma_v2.h drivers/dma/ioat/pci.c drivers/md/raid5.c
Showing
- .gitignore 9 additions, 1 deletion.gitignore
- CREDITS 4 additions, 0 deletionsCREDITS
- Documentation/ABI/testing/sysfs-block 59 additions, 0 deletionsDocumentation/ABI/testing/sysfs-block
- Documentation/ABI/testing/sysfs-bus-pci 7 additions, 0 deletionsDocumentation/ABI/testing/sysfs-bus-pci
- Documentation/ABI/testing/sysfs-bus-pci-devices-cciss 33 additions, 0 deletionsDocumentation/ABI/testing/sysfs-bus-pci-devices-cciss
- Documentation/ABI/testing/sysfs-class-mtd 125 additions, 0 deletionsDocumentation/ABI/testing/sysfs-class-mtd
- Documentation/ABI/testing/sysfs-devices-cache_disable 18 additions, 0 deletionsDocumentation/ABI/testing/sysfs-devices-cache_disable
- Documentation/ABI/testing/sysfs-fs-ext4 10 additions, 0 deletionsDocumentation/ABI/testing/sysfs-fs-ext4
- Documentation/ABI/testing/sysfs-pps 73 additions, 0 deletionsDocumentation/ABI/testing/sysfs-pps
- Documentation/Changes 24 additions, 2 deletionsDocumentation/Changes
- Documentation/CodingStyle 2 additions, 2 deletionsDocumentation/CodingStyle
- Documentation/DMA-API.txt 14 additions, 2 deletionsDocumentation/DMA-API.txt
- Documentation/DocBook/Makefile 2 additions, 1 deletionDocumentation/DocBook/Makefile
- Documentation/DocBook/debugobjects.tmpl 1 addition, 1 deletionDocumentation/DocBook/debugobjects.tmpl
- Documentation/DocBook/mac80211.tmpl 0 additions, 1 deletionDocumentation/DocBook/mac80211.tmpl
- Documentation/DocBook/tracepoint.tmpl 89 additions, 0 deletionsDocumentation/DocBook/tracepoint.tmpl
- Documentation/PCI/pcieaer-howto.txt 25 additions, 0 deletionsDocumentation/PCI/pcieaer-howto.txt
- Documentation/RCU/rculist_nulls.txt 1 addition, 1 deletionDocumentation/RCU/rculist_nulls.txt
- Documentation/RCU/trace.txt 80 additions, 22 deletionsDocumentation/RCU/trace.txt
- Documentation/SM501.txt 1 addition, 1 deletionDocumentation/SM501.txt
Loading
Please register or sign in to comment