Merge branch 'upstream-fixes'
Showing
- CREDITS 1 addition, 1 deletionCREDITS
- Documentation/DocBook/Makefile 33 additions, 15 deletionsDocumentation/DocBook/Makefile
- Documentation/DocBook/kernel-api.tmpl 2 additions, 4 deletionsDocumentation/DocBook/kernel-api.tmpl
- Documentation/DocBook/stylesheet.xsl 1 addition, 0 deletionsDocumentation/DocBook/stylesheet.xsl
- Documentation/atomic_ops.txt 27 additions, 0 deletionsDocumentation/atomic_ops.txt
- Documentation/block/biodoc.txt 2 additions, 2 deletionsDocumentation/block/biodoc.txt
- Documentation/feature-removal-schedule.txt 9 additions, 0 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/oops-tracing.txt 6 additions, 1 deletionDocumentation/oops-tracing.txt
- Documentation/video4linux/CARDLIST.bttv 1 addition, 0 deletionsDocumentation/video4linux/CARDLIST.bttv
- Documentation/video4linux/CARDLIST.saa7134 2 additions, 0 deletionsDocumentation/video4linux/CARDLIST.saa7134
- Documentation/video4linux/CARDLIST.tuner 1 addition, 0 deletionsDocumentation/video4linux/CARDLIST.tuner
- Documentation/x86_64/boot-options.txt 10 additions, 2 deletionsDocumentation/x86_64/boot-options.txt
- Documentation/x86_64/mm.txt 5 additions, 1 deletionDocumentation/x86_64/mm.txt
- MAINTAINERS 11 additions, 1 deletionMAINTAINERS
- Makefile 12 additions, 1 deletionMakefile
- README 5 additions, 0 deletionsREADME
- arch/arm/Kconfig 4 additions, 16 deletionsarch/arm/Kconfig
- arch/arm/common/locomo.c 1 addition, 3 deletionsarch/arm/common/locomo.c
- arch/arm/common/sa1111.c 1 addition, 1 deletionarch/arm/common/sa1111.c
- arch/arm/common/scoop.c 1 addition, 1 deletionarch/arm/common/scoop.c
Loading
Please register or sign in to comment