Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
Showing
- Documentation/ABI/testing/procfs-diskstats 1 addition, 1 deletionDocumentation/ABI/testing/procfs-diskstats
- Documentation/ABI/testing/sysfs-block 1 addition, 1 deletionDocumentation/ABI/testing/sysfs-block
- Documentation/DocBook/genericirq.tmpl 2 additions, 2 deletionsDocumentation/DocBook/genericirq.tmpl
- Documentation/DocBook/mtdnand.tmpl 1 addition, 1 deletionDocumentation/DocBook/mtdnand.tmpl
- Documentation/DocBook/v4l/videodev2.h.xml 1 addition, 1 deletionDocumentation/DocBook/v4l/videodev2.h.xml
- Documentation/DocBook/writing-an-alsa-driver.tmpl 1 addition, 1 deletionDocumentation/DocBook/writing-an-alsa-driver.tmpl
- Documentation/dvb/README.dvb-usb 1 addition, 1 deletionDocumentation/dvb/README.dvb-usb
- Documentation/edac.txt 3 additions, 4 deletionsDocumentation/edac.txt
- Documentation/lguest/lguest.c 1 addition, 1 deletionDocumentation/lguest/lguest.c
- Documentation/oops-tracing.txt 2 additions, 0 deletionsDocumentation/oops-tracing.txt
- Documentation/power/regulator/consumer.txt 1 addition, 1 deletionDocumentation/power/regulator/consumer.txt
- Documentation/scsi/ChangeLog.megaraid_sas 1 addition, 1 deletionDocumentation/scsi/ChangeLog.megaraid_sas
- Documentation/spi/spi-summary 1 addition, 1 deletionDocumentation/spi/spi-summary
- Documentation/sysctl/kernel.txt 3 additions, 3 deletionsDocumentation/sysctl/kernel.txt
- Documentation/sysctl/vm.txt 1 addition, 1 deletionDocumentation/sysctl/vm.txt
- Documentation/timers/hpet.txt 1 addition, 1 deletionDocumentation/timers/hpet.txt
- Documentation/video4linux/gspca.txt 1 addition, 1 deletionDocumentation/video4linux/gspca.txt
- Documentation/vm/page-types.c 1 addition, 1 deletionDocumentation/vm/page-types.c
- Documentation/vm/slub.txt 1 addition, 1 deletionDocumentation/vm/slub.txt
- arch/alpha/mm/numa.c 1 addition, 1 deletionarch/alpha/mm/numa.c
Loading
Please register or sign in to comment