Merge branch 'linus' into tracing/core
Conflicts: include/linux/module.h kernel/module.c Semantic conflict: include/trace/events/module.h Merge reason: Resolve the conflict with upstream commit 5fbfb18d ("Fix up possibly racy module refcounting") Signed-off-by:Ingo Molnar <mingo@elte.hu>
No related branches found
No related tags found
Showing
- Documentation/connector/cn_test.c 1 addition, 0 deletionsDocumentation/connector/cn_test.c
- Documentation/fb/efifb.txt 7 additions, 7 deletionsDocumentation/fb/efifb.txt
- Documentation/filesystems/9p.txt 16 additions, 2 deletionsDocumentation/filesystems/9p.txt
- Documentation/networking/stmmac.txt 143 additions, 0 deletionsDocumentation/networking/stmmac.txt
- Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe.txt 54 additions, 0 deletionsDocumentation/powerpc/dts-bindings/fsl/cpm_qe/qe.txt
- Documentation/sound/alsa/HD-Audio.txt 12 additions, 4 deletionsDocumentation/sound/alsa/HD-Audio.txt
- Documentation/watchdog/src/watchdog-simple.c 0 additions, 3 deletionsDocumentation/watchdog/src/watchdog-simple.c
- Documentation/watchdog/src/watchdog-test.c 6 additions, 2 deletionsDocumentation/watchdog/src/watchdog-test.c
- Documentation/watchdog/watchdog-api.txt 2 additions, 3 deletionsDocumentation/watchdog/watchdog-api.txt
- MAINTAINERS 7 additions, 6 deletionsMAINTAINERS
- arch/alpha/boot/bootp.c 1 addition, 0 deletionsarch/alpha/boot/bootp.c
- arch/alpha/boot/bootpz.c 1 addition, 0 deletionsarch/alpha/boot/bootpz.c
- arch/alpha/boot/main.c 1 addition, 0 deletionsarch/alpha/boot/main.c
- arch/alpha/boot/misc.c 1 addition, 0 deletionsarch/alpha/boot/misc.c
- arch/alpha/kernel/irq.c 0 additions, 1 deletionarch/alpha/kernel/irq.c
- arch/alpha/kernel/osf_sys.c 1 addition, 1 deletionarch/alpha/kernel/osf_sys.c
- arch/alpha/kernel/pci-noop.c 1 addition, 0 deletionsarch/alpha/kernel/pci-noop.c
- arch/alpha/kernel/pci-sysfs.c 1 addition, 0 deletionsarch/alpha/kernel/pci-sysfs.c
- arch/alpha/kernel/pci_iommu.c 1 addition, 1 deletionarch/alpha/kernel/pci_iommu.c
- arch/alpha/kernel/process.c 1 addition, 1 deletionarch/alpha/kernel/process.c
Loading
Please register or sign in to comment