Merge branch 'highbank/soc' into next/soc
Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/mach-omap2/board-generic.c arch/arm/plat-mxc/include/mach/gpio.h
Showing
- Documentation/devicetree/bindings/arm/calxeda.txt 8 additions, 0 deletionsDocumentation/devicetree/bindings/arm/calxeda.txt
- Documentation/devicetree/bindings/arm/l2cc.txt 44 additions, 0 deletionsDocumentation/devicetree/bindings/arm/l2cc.txt
- MAINTAINERS 6 additions, 0 deletionsMAINTAINERS
- arch/arm/Kconfig 16 additions, 1 deletionarch/arm/Kconfig
- arch/arm/Kconfig.debug 66 additions, 30 deletionsarch/arm/Kconfig.debug
- arch/arm/Makefile 1 addition, 0 deletionsarch/arm/Makefile
- arch/arm/boot/dts/highbank.dts 198 additions, 0 deletionsarch/arm/boot/dts/highbank.dts
- arch/arm/common/scoop.c 1 addition, 1 deletionarch/arm/common/scoop.c
- arch/arm/include/asm/ecard.h 0 additions, 1 deletionarch/arm/include/asm/ecard.h
- arch/arm/include/asm/gpio.h 19 additions, 0 deletionsarch/arm/include/asm/gpio.h
- arch/arm/include/asm/hardware/cache-l2x0.h 49 additions, 0 deletionsarch/arm/include/asm/hardware/cache-l2x0.h
- arch/arm/include/asm/hardware/iop3xx-gpio.h 2 additions, 0 deletionsarch/arm/include/asm/hardware/iop3xx-gpio.h
- arch/arm/include/asm/io.h 21 additions, 0 deletionsarch/arm/include/asm/io.h
- arch/arm/include/asm/outercache.h 7 additions, 0 deletionsarch/arm/include/asm/outercache.h
- arch/arm/kernel/asm-offsets.c 12 additions, 0 deletionsarch/arm/kernel/asm-offsets.c
- arch/arm/kernel/ecard.c 13 additions, 23 deletionsarch/arm/kernel/ecard.c
- arch/arm/mach-at91/at91cap9_devices.c 1 addition, 1 deletionarch/arm/mach-at91/at91cap9_devices.c
- arch/arm/mach-at91/at91rm9200_devices.c 1 addition, 1 deletionarch/arm/mach-at91/at91rm9200_devices.c
- arch/arm/mach-at91/at91sam9260_devices.c 1 addition, 1 deletionarch/arm/mach-at91/at91sam9260_devices.c
- arch/arm/mach-at91/at91sam9261_devices.c 1 addition, 1 deletionarch/arm/mach-at91/at91sam9261_devices.c
Loading
Please register or sign in to comment