-
- Downloads
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/util/python.c
Merge reason: resolve the conflict with perf/urgent.
Signed-off-by: 
Ingo Molnar <mingo@elte.hu>
Showing
- Documentation/kernel-parameters.txt 4 additions, 1 deletionDocumentation/kernel-parameters.txt
- Documentation/virtual/lguest/Makefile 1 addition, 1 deletionDocumentation/virtual/lguest/Makefile
- Documentation/virtual/lguest/lguest.c 2 additions, 20 deletionsDocumentation/virtual/lguest/lguest.c
- arch/ia64/include/asm/unistd.h 2 additions, 1 deletionarch/ia64/include/asm/unistd.h
- arch/ia64/kernel/entry.S 1 addition, 0 deletionsarch/ia64/kernel/entry.S
- arch/powerpc/platforms/powermac/pic.c 2 additions, 1 deletionarch/powerpc/platforms/powermac/pic.c
- arch/x86/kernel/Makefile 2 additions, 0 deletionsarch/x86/kernel/Makefile
- arch/x86/kernel/process.c 1 addition, 1 deletionarch/x86/kernel/process.c
- arch/x86/kernel/smpboot.c 1 addition, 1 deletionarch/x86/kernel/smpboot.c
- arch/x86/lguest/boot.c 1 addition, 0 deletionsarch/x86/lguest/boot.c
- drivers/block/paride/pcd.c 0 additions, 1 deletiondrivers/block/paride/pcd.c
- drivers/block/virtio_blk.c 80 additions, 11 deletionsdrivers/block/virtio_blk.c
- drivers/cdrom/viocd.c 0 additions, 1 deletiondrivers/cdrom/viocd.c
- drivers/char/virtio_console.c 0 additions, 5 deletionsdrivers/char/virtio_console.c
- drivers/ide/ide-cd.c 0 additions, 1 deletiondrivers/ide/ide-cd.c
- drivers/misc/kgdbts.c 4 additions, 1 deletiondrivers/misc/kgdbts.c
- drivers/net/virtio_net.c 1 addition, 1 deletiondrivers/net/virtio_net.c
- drivers/pci/dmar.c 1 addition, 6 deletionsdrivers/pci/dmar.c
- drivers/pci/intel-iommu.c 201 additions, 39 deletionsdrivers/pci/intel-iommu.c
- drivers/pci/iova.c 10 additions, 2 deletionsdrivers/pci/iova.c
Loading
Please register or sign in to comment