-
- Downloads
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Manual conflict merge of arch/arm/Kconfig
No related branches found
No related tags found
Showing
- arch/arm/Kconfig 36 additions, 8 deletionsarch/arm/Kconfig
- arch/arm/configs/enp2611_defconfig 1 addition, 1 deletionarch/arm/configs/enp2611_defconfig
- arch/arm/configs/ixdp2400_defconfig 1 addition, 1 deletionarch/arm/configs/ixdp2400_defconfig
- arch/arm/configs/ixdp2401_defconfig 1 addition, 1 deletionarch/arm/configs/ixdp2401_defconfig
- arch/arm/configs/ixdp2801_defconfig 1 addition, 1 deletionarch/arm/configs/ixdp2801_defconfig
- arch/arm/configs/s3c2410_defconfig 38 additions, 13 deletionsarch/arm/configs/s3c2410_defconfig
- arch/arm/kernel/calls.S 4 additions, 4 deletionsarch/arm/kernel/calls.S
- arch/arm/kernel/entry-armv.S 16 additions, 1 deletionarch/arm/kernel/entry-armv.S
- arch/arm/kernel/sys_oabi-compat.c 71 additions, 0 deletionsarch/arm/kernel/sys_oabi-compat.c
- arch/arm/mach-clps711x/Kconfig 2 additions, 0 deletionsarch/arm/mach-clps711x/Kconfig
- arch/arm/mach-ixp2000/enp2611.c 1 addition, 0 deletionsarch/arm/mach-ixp2000/enp2611.c
- arch/arm/mach-ixp2000/ixdp2400.c 1 addition, 0 deletionsarch/arm/mach-ixp2000/ixdp2400.c
- arch/arm/mach-ixp2000/ixdp2x01.c 4 additions, 1 deletionarch/arm/mach-ixp2000/ixdp2x01.c
- arch/arm/mach-omap1/board-generic.c 2 additions, 1 deletionarch/arm/mach-omap1/board-generic.c
- arch/arm/mach-omap1/board-h2.c 2 additions, 1 deletionarch/arm/mach-omap1/board-h2.c
- arch/arm/mach-omap1/board-h3.c 2 additions, 1 deletionarch/arm/mach-omap1/board-h3.c
- arch/arm/mach-omap1/board-innovator.c 2 additions, 1 deletionarch/arm/mach-omap1/board-innovator.c
- arch/arm/mach-omap1/board-netstar.c 2 additions, 1 deletionarch/arm/mach-omap1/board-netstar.c
- arch/arm/mach-omap1/board-osk.c 2 additions, 1 deletionarch/arm/mach-omap1/board-osk.c
- arch/arm/mach-omap1/board-palmte.c 2 additions, 1 deletionarch/arm/mach-omap1/board-palmte.c
Loading
Please register or sign in to comment