Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by:
Ingo Molnar <mingo@elte.hu>
Showing
- Documentation/SubmittingPatches 26 additions, 0 deletionsDocumentation/SubmittingPatches
- Documentation/feature-removal-schedule.txt 24 additions, 0 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/i2c/upgrading-clients 281 additions, 0 deletionsDocumentation/i2c/upgrading-clients
- Documentation/video4linux/CARDLIST.au0828 1 addition, 0 deletionsDocumentation/video4linux/CARDLIST.au0828
- Documentation/video4linux/CARDLIST.em28xx 42 additions, 3 deletionsDocumentation/video4linux/CARDLIST.em28xx
- Documentation/video4linux/gspca.txt 1 addition, 1 deletionDocumentation/video4linux/gspca.txt
- MAINTAINERS 6 additions, 0 deletionsMAINTAINERS
- Makefile 5 additions, 1 deletionMakefile
- arch/powerpc/Kconfig 1 addition, 0 deletionsarch/powerpc/Kconfig
- arch/powerpc/kernel/entry_32.S 11 additions, 6 deletionsarch/powerpc/kernel/entry_32.S
- arch/powerpc/kernel/entry_64.S 7 additions, 3 deletionsarch/powerpc/kernel/entry_64.S
- arch/powerpc/kernel/legacy_serial.c 17 additions, 27 deletionsarch/powerpc/kernel/legacy_serial.c
- arch/powerpc/kernel/process.c 4 additions, 4 deletionsarch/powerpc/kernel/process.c
- arch/powerpc/kernel/prom_init.c 3 additions, 36 deletionsarch/powerpc/kernel/prom_init.c
- arch/powerpc/kernel/ptrace.c 26 additions, 28 deletionsarch/powerpc/kernel/ptrace.c
- arch/powerpc/kernel/setup-common.c 0 additions, 24 deletionsarch/powerpc/kernel/setup-common.c
- arch/powerpc/kernel/setup_64.c 0 additions, 3 deletionsarch/powerpc/kernel/setup_64.c
- arch/powerpc/kernel/signal.c 20 additions, 3 deletionsarch/powerpc/kernel/signal.c
- arch/powerpc/kernel/smp.c 116 additions, 3 deletionsarch/powerpc/kernel/smp.c
- arch/powerpc/kernel/stacktrace.c 0 additions, 1 deletionarch/powerpc/kernel/stacktrace.c
Loading
Please register or sign in to comment