Merge branch 'sched/urgent' into sched/core
Merge reason: avoid upcoming patch conflict.
Signed-off-by:
Ingo Molnar <mingo@elte.hu>
Showing
- CREDITS 7 additions, 1 deletionCREDITS
- Documentation/RCU/rculist_nulls.txt 6 additions, 1 deletionDocumentation/RCU/rculist_nulls.txt
- Documentation/connector/cn_test.c 2 additions, 2 deletionsDocumentation/connector/cn_test.c
- Documentation/connector/ucon.c 1 addition, 1 deletionDocumentation/connector/ucon.c
- Documentation/filesystems/sysfs.txt 2 additions, 1 deletionDocumentation/filesystems/sysfs.txt
- Documentation/lguest/lguest.c 483 additions, 238 deletionsDocumentation/lguest/lguest.c
- Documentation/networking/6pack.txt 1 addition, 1 deletionDocumentation/networking/6pack.txt
- Documentation/sound/alsa/Procfile.txt 5 additions, 0 deletionsDocumentation/sound/alsa/Procfile.txt
- Documentation/sysrq.txt 4 additions, 3 deletionsDocumentation/sysrq.txt
- Documentation/video4linux/CARDLIST.em28xx 1 addition, 1 deletionDocumentation/video4linux/CARDLIST.em28xx
- Documentation/video4linux/gspca.txt 32 additions, 0 deletionsDocumentation/video4linux/gspca.txt
- MAINTAINERS 930 additions, 1848 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/alpha/include/asm/tlb.h 2 additions, 2 deletionsarch/alpha/include/asm/tlb.h
- arch/arm/configs/u300_defconfig 8 additions, 10 deletionsarch/arm/configs/u300_defconfig
- arch/arm/include/asm/tlb.h 2 additions, 2 deletionsarch/arm/include/asm/tlb.h
- arch/arm/mach-at91/include/mach/at_hdmac.h 102 additions, 0 deletionsarch/arm/mach-at91/include/mach/at_hdmac.h
- arch/arm/mach-ep93xx/dma-m2p.c 1 addition, 0 deletionsarch/arm/mach-ep93xx/dma-m2p.c
- arch/arm/mach-kirkwood/mpp.h 1 addition, 1 deletionarch/arm/mach-kirkwood/mpp.h
- arch/arm/mach-mx3/Kconfig 8 additions, 0 deletionsarch/arm/mach-mx3/Kconfig
Loading
Please register or sign in to comment