Merge branch 'linus' into core/percpu
Conflicts: kernel/irq/handle.c
No related branches found
No related tags found
Showing
- Documentation/Changes 3 additions, 1 deletionDocumentation/Changes
- Documentation/CodingStyle 13 additions, 5 deletionsDocumentation/CodingStyle
- Documentation/DMA-API.txt 1 addition, 1 deletionDocumentation/DMA-API.txt
- Documentation/DocBook/uio-howto.tmpl 88 additions, 0 deletionsDocumentation/DocBook/uio-howto.tmpl
- Documentation/IO-mapping.txt 2 additions, 2 deletionsDocumentation/IO-mapping.txt
- Documentation/block/biodoc.txt 3 additions, 2 deletionsDocumentation/block/biodoc.txt
- Documentation/cgroups/memcg_test.txt 22 additions, 2 deletionsDocumentation/cgroups/memcg_test.txt
- Documentation/filesystems/nfs-rdma.txt 2 additions, 2 deletionsDocumentation/filesystems/nfs-rdma.txt
- Documentation/filesystems/proc.txt 28 additions, 0 deletionsDocumentation/filesystems/proc.txt
- Documentation/ja_JP/stable_kernel_rules.txt 10 additions, 5 deletionsDocumentation/ja_JP/stable_kernel_rules.txt
- Documentation/lguest/Makefile 1 addition, 1 deletionDocumentation/lguest/Makefile
- Documentation/usb/dma.txt 6 additions, 5 deletionsDocumentation/usb/dma.txt
- Makefile 1 addition, 1 deletionMakefile
- arch/alpha/Kconfig 1 addition, 0 deletionsarch/alpha/Kconfig
- arch/alpha/include/asm/bug.h 6 additions, 11 deletionsarch/alpha/include/asm/bug.h
- arch/alpha/include/asm/dma-mapping.h 2 additions, 0 deletionsarch/alpha/include/asm/dma-mapping.h
- arch/alpha/kernel/entry.S 1 addition, 1 deletionarch/alpha/kernel/entry.S
- arch/alpha/kernel/osf_sys.c 50 additions, 63 deletionsarch/alpha/kernel/osf_sys.c
- arch/alpha/kernel/pci-noop.c 2 additions, 1 deletionarch/alpha/kernel/pci-noop.c
- arch/alpha/kernel/signal.c 9 additions, 9 deletionsarch/alpha/kernel/signal.c
Loading
Please register or sign in to comment