Merge commit 'origin/master' into next
Showing
- Documentation/filesystems/ocfs2.txt 3 additions, 3 deletionsDocumentation/filesystems/ocfs2.txt
- Documentation/vm/page-types.c 1 addition, 1 deletionDocumentation/vm/page-types.c
- MAINTAINERS 27 additions, 24 deletionsMAINTAINERS
- Makefile 2 additions, 2 deletionsMakefile
- arch/alpha/boot/tools/objstrip.c 1 addition, 1 deletionarch/alpha/boot/tools/objstrip.c
- arch/alpha/include/asm/fcntl.h 0 additions, 2 deletionsarch/alpha/include/asm/fcntl.h
- arch/alpha/include/asm/thread_info.h 2 additions, 2 deletionsarch/alpha/include/asm/thread_info.h
- arch/arm/configs/ams_delta_defconfig 17 additions, 7 deletionsarch/arm/configs/ams_delta_defconfig
- arch/arm/configs/omap3_pandora_defconfig 44 additions, 5 deletionsarch/arm/configs/omap3_pandora_defconfig
- arch/arm/configs/omap_3430sdp_defconfig 8 additions, 1 deletionarch/arm/configs/omap_3430sdp_defconfig
- arch/arm/mach-at91/Kconfig 11 additions, 9 deletionsarch/arm/mach-at91/Kconfig
- arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c 15 additions, 8 deletionsarch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c
- arch/arm/mach-kirkwood/common.c 8 additions, 0 deletionsarch/arm/mach-kirkwood/common.c
- arch/arm/mach-kirkwood/include/mach/bridge-regs.h 3 additions, 0 deletionsarch/arm/mach-kirkwood/include/mach/bridge-regs.h
- arch/arm/mach-mmp/include/mach/mfp-pxa910.h 1 addition, 1 deletionarch/arm/mach-mmp/include/mach/mfp-pxa910.h
- arch/arm/mach-omap2/board-omap3beagle.c 1 addition, 1 deletionarch/arm/mach-omap2/board-omap3beagle.c
- arch/arm/mach-omap2/board-omap3pandora.c 39 additions, 39 deletionsarch/arm/mach-omap2/board-omap3pandora.c
- arch/arm/mach-omap2/board-zoom2.c 43 additions, 44 deletionsarch/arm/mach-omap2/board-zoom2.c
- arch/arm/mach-omap2/clock34xx.c 1 addition, 1 deletionarch/arm/mach-omap2/clock34xx.c
- arch/arm/mach-omap2/clock34xx.h 2 additions, 2 deletionsarch/arm/mach-omap2/clock34xx.h
Loading
Please register or sign in to comment