Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: drivers/pci/dmar.c
No related branches found
No related tags found
Showing
- CREDITS 6 additions, 6 deletionsCREDITS
- Documentation/DocBook/kernel-hacking.tmpl 1 addition, 1 deletionDocumentation/DocBook/kernel-hacking.tmpl
- Documentation/MSI-HOWTO.txt 2 additions, 4 deletionsDocumentation/MSI-HOWTO.txt
- Documentation/PCI/pci.txt 4 additions, 0 deletionsDocumentation/PCI/pci.txt
- Documentation/PCI/pcieaer-howto.txt 3 additions, 8 deletionsDocumentation/PCI/pcieaer-howto.txt
- Documentation/kernel-parameters.txt 19 additions, 12 deletionsDocumentation/kernel-parameters.txt
- Documentation/markers.txt 6 additions, 4 deletionsDocumentation/markers.txt
- Documentation/sysrq.txt 3 additions, 2 deletionsDocumentation/sysrq.txt
- Documentation/tracepoints.txt 101 additions, 0 deletionsDocumentation/tracepoints.txt
- Documentation/tracers/mmiotrace.txt 2 additions, 3 deletionsDocumentation/tracers/mmiotrace.txt
- MAINTAINERS 1 addition, 1 deletionMAINTAINERS
- arch/alpha/kernel/sys_sable.c 3 additions, 3 deletionsarch/alpha/kernel/sys_sable.c
- arch/arm/mach-iop13xx/include/mach/time.h 2 additions, 2 deletionsarch/arm/mach-iop13xx/include/mach/time.h
- arch/arm/mach-ixp2000/ixdp2x00.c 2 additions, 2 deletionsarch/arm/mach-ixp2000/ixdp2x00.c
- arch/arm/mach-omap2/irq.c 4 additions, 4 deletionsarch/arm/mach-omap2/irq.c
- arch/arm/mach-pxa/include/mach/zylonite.h 2 additions, 2 deletionsarch/arm/mach-pxa/include/mach/zylonite.h
- arch/arm/mach-sa1100/include/mach/ide.h 0 additions, 75 deletionsarch/arm/mach-sa1100/include/mach/ide.h
- arch/avr32/mach-at32ap/extint.c 4 additions, 4 deletionsarch/avr32/mach-at32ap/extint.c
- arch/ia64/include/asm/pci.h 2 additions, 10 deletionsarch/ia64/include/asm/pci.h
- arch/ia64/pci/pci.c 6 additions, 1 deletionarch/ia64/pci/pci.c
Loading
Please register or sign in to comment