Merge branch 'linux-2.6'
Showing
- arch/sparc64/mm/init.c 20 additions, 9 deletionsarch/sparc64/mm/init.c
- arch/um/drivers/net_kern.c 1 addition, 1 deletionarch/um/drivers/net_kern.c
- arch/um/drivers/net_user.c 1 addition, 1 deletionarch/um/drivers/net_user.c
- arch/um/drivers/slip_user.c 2 additions, 10 deletionsarch/um/drivers/slip_user.c
- arch/um/drivers/slirp_user.c 3 additions, 12 deletionsarch/um/drivers/slirp_user.c
- arch/um/drivers/ubd_user.c 1 addition, 2 deletionsarch/um/drivers/ubd_user.c
- arch/um/include/os.h 1 addition, 1 deletionarch/um/include/os.h
- arch/um/os-Linux/aio.c 2 additions, 2 deletionsarch/um/os-Linux/aio.c
- arch/um/os-Linux/drivers/ethertap_user.c 2 additions, 8 deletionsarch/um/os-Linux/drivers/ethertap_user.c
- arch/um/os-Linux/drivers/tuntap_user.c 1 addition, 1 deletionarch/um/os-Linux/drivers/tuntap_user.c
- arch/um/os-Linux/helper.c 27 additions, 11 deletionsarch/um/os-Linux/helper.c
- arch/um/os-Linux/process.c 2 additions, 2 deletionsarch/um/os-Linux/process.c
- arch/um/os-Linux/skas/process.c 7 additions, 5 deletionsarch/um/os-Linux/skas/process.c
- arch/um/os-Linux/util.c 1 addition, 1 deletionarch/um/os-Linux/util.c
- arch/x86/kernel/apic_32.c 1 addition, 1 deletionarch/x86/kernel/apic_32.c
- arch/x86/kernel/cpu/intel_cacheinfo.c 1 addition, 0 deletionsarch/x86/kernel/cpu/intel_cacheinfo.c
- arch/x86/kernel/io_apic_32.c 12 additions, 4 deletionsarch/x86/kernel/io_apic_32.c
- arch/x86/kernel/io_apic_64.c 12 additions, 4 deletionsarch/x86/kernel/io_apic_64.c
- arch/x86/kernel/kprobes_32.c 1 addition, 3 deletionsarch/x86/kernel/kprobes_32.c
- arch/x86/kernel/kprobes_64.c 20 additions, 27 deletionsarch/x86/kernel/kprobes_64.c
Loading
Please register or sign in to comment