Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: MAINTAINERS
Showing
- Documentation/DocBook/Makefile 8 additions, 3 deletionsDocumentation/DocBook/Makefile
- Documentation/cgroups/cpuacct.txt 18 additions, 0 deletionsDocumentation/cgroups/cpuacct.txt
- Documentation/feature-removal-schedule.txt 9 additions, 0 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/infiniband/ipoib.txt 45 additions, 0 deletionsDocumentation/infiniband/ipoib.txt
- Documentation/input/rotary-encoder.txt 101 additions, 0 deletionsDocumentation/input/rotary-encoder.txt
- Documentation/kbuild/makefiles.txt 75 additions, 8 deletionsDocumentation/kbuild/makefiles.txt
- Documentation/sparse.txt 8 additions, 0 deletionsDocumentation/sparse.txt
- Documentation/trace/ftrace.txt 0 additions, 0 deletionsDocumentation/trace/ftrace.txt
- Documentation/trace/kmemtrace.txt 0 additions, 0 deletionsDocumentation/trace/kmemtrace.txt
- Documentation/trace/mmiotrace.txt 0 additions, 0 deletionsDocumentation/trace/mmiotrace.txt
- Documentation/trace/tracepoints.txt 0 additions, 0 deletionsDocumentation/trace/tracepoints.txt
- MAINTAINERS 1393 additions, 192 deletionsMAINTAINERS
- Makefile 6 additions, 2 deletionsMakefile
- arch/Kconfig 3 additions, 0 deletionsarch/Kconfig
- arch/arm/configs/magician_defconfig 5 additions, 1 deletionarch/arm/configs/magician_defconfig
- arch/arm/include/asm/sizes.h 1 addition, 0 deletionsarch/arm/include/asm/sizes.h
- arch/arm/mach-at91/include/mach/board.h 1 addition, 1 deletionarch/arm/mach-at91/include/mach/board.h
- arch/arm/mach-omap1/clock.c 11 additions, 10 deletionsarch/arm/mach-omap1/clock.c
- arch/arm/mach-pxa/Kconfig 9 additions, 0 deletionsarch/arm/mach-pxa/Kconfig
- arch/arm/mach-pxa/Makefile 1 addition, 0 deletionsarch/arm/mach-pxa/Makefile
Loading
Please register or sign in to comment