Merge branch 'linux-2.6'
Showing
- arch/x86/kernel/process_32.c 1 addition, 1 deletionarch/x86/kernel/process_32.c
- arch/x86/kernel/setup_32.c 1 addition, 1 deletionarch/x86/kernel/setup_32.c
- arch/x86/kernel/smpboot_32.c 3 additions, 3 deletionsarch/x86/kernel/smpboot_32.c
- arch/x86/kernel/smpboot_64.c 1 addition, 1 deletionarch/x86/kernel/smpboot_64.c
- arch/x86/kernel/suspend_64.c 6 additions, 33 deletionsarch/x86/kernel/suspend_64.c
- arch/x86/kernel/traps_32.c 3 additions, 4 deletionsarch/x86/kernel/traps_32.c
- arch/x86/oprofile/op_model_athlon.c 16 additions, 6 deletionsarch/x86/oprofile/op_model_athlon.c
- arch/x86/xen/enlighten.c 1 addition, 1 deletionarch/x86/xen/enlighten.c
- arch/xtensa/platform-iss/network.c 2 additions, 2 deletionsarch/xtensa/platform-iss/network.c
- block/as-iosched.c 7 additions, 4 deletionsblock/as-iosched.c
- block/cfq-iosched.c 2 additions, 6 deletionsblock/cfq-iosched.c
- block/deadline-iosched.c 3 additions, 1 deletionblock/deadline-iosched.c
- block/elevator.c 1 addition, 2 deletionsblock/elevator.c
- block/noop-iosched.c 3 additions, 1 deletionblock/noop-iosched.c
- block/scsi_ioctl.c 2 additions, 2 deletionsblock/scsi_ioctl.c
- drivers/acpi/battery.c 1 addition, 1 deletiondrivers/acpi/battery.c
- drivers/acpi/numa.c 2 additions, 2 deletionsdrivers/acpi/numa.c
- drivers/acpi/pci_bind.c 0 additions, 3 deletionsdrivers/acpi/pci_bind.c
- drivers/acpi/sbs.c 12 additions, 15 deletionsdrivers/acpi/sbs.c
- drivers/acpi/sbshc.c 13 additions, 4 deletionsdrivers/acpi/sbshc.c
Loading
Please register or sign in to comment