Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] pxa: corgi backlight driver should not select ssp drivers [ARM] 5321/1: Kirkwood: fix typo in Makefile [ARM] 5320/1: fix assembly constraints in implementation of do_div() [ARM] 5318/1: Swap the PRRR and NMRR values in proc-v7.S [ARM] 5316/1: AT91: oops (regression) fix on gpio irq [ARM] msm: vreg interface to msm7k pmic [ARM] msm: dma: various basic dma improvements and bugfixes [ARM] msm: clock: provide clk_*() api support for [ARM] msm: clean up iomap and devices [ARM] msm: add proc_comm support, necessary for clock and power control [ARM] msm: rename ARCH_MSM7X00A to ARCH_MSM [ARM] pxa/spitz: fix unbalance parenthesis in header file spitz.h [ARM] pxa: update {corgi,spitz}_defconfig to favor SPI-based drivers [ARM] pxa: fix the corgi_ssp.c dependency issue in {corgi,spitz}_defconfig Revert "[ARM] pxa/corgi: remove now unused corgi_ssp.c and corgi_lcd.c"
No related branches found
No related tags found
Showing
- arch/arm/Kconfig 4 additions, 5 deletionsarch/arm/Kconfig
- arch/arm/Makefile 1 addition, 1 deletionarch/arm/Makefile
- arch/arm/configs/corgi_defconfig 862 additions, 534 deletionsarch/arm/configs/corgi_defconfig
- arch/arm/configs/msm_defconfig 1 addition, 1 deletionarch/arm/configs/msm_defconfig
- arch/arm/configs/spitz_defconfig 828 additions, 466 deletionsarch/arm/configs/spitz_defconfig
- arch/arm/include/asm/div64.h 3 additions, 3 deletionsarch/arm/include/asm/div64.h
- arch/arm/mach-at91/gpio.c 1 addition, 0 deletionsarch/arm/mach-at91/gpio.c
- arch/arm/mach-kirkwood/Makefile 1 addition, 1 deletionarch/arm/mach-kirkwood/Makefile
- arch/arm/mach-msm/Kconfig 6 additions, 11 deletionsarch/arm/mach-msm/Kconfig
- arch/arm/mach-msm/Makefile 4 additions, 3 deletionsarch/arm/mach-msm/Makefile
- arch/arm/mach-msm/board-halibut.c 8 additions, 30 deletionsarch/arm/mach-msm/board-halibut.c
- arch/arm/mach-msm/clock-7x01a.c 126 additions, 0 deletionsarch/arm/mach-msm/clock-7x01a.c
- arch/arm/mach-msm/clock.c 218 additions, 0 deletionsarch/arm/mach-msm/clock.c
- arch/arm/mach-msm/clock.h 48 additions, 0 deletionsarch/arm/mach-msm/clock.h
- arch/arm/mach-msm/common.c 0 additions, 116 deletionsarch/arm/mach-msm/common.c
- arch/arm/mach-msm/devices.c 267 additions, 0 deletionsarch/arm/mach-msm/devices.c
- arch/arm/mach-msm/devices.h 36 additions, 0 deletionsarch/arm/mach-msm/devices.h
- arch/arm/mach-msm/dma.c 52 additions, 20 deletionsarch/arm/mach-msm/dma.c
- arch/arm/mach-msm/include/mach/board.h 1 addition, 0 deletionsarch/arm/mach-msm/include/mach/board.h
- arch/arm/mach-msm/include/mach/debug-macro.S 6 additions, 2 deletionsarch/arm/mach-msm/include/mach/debug-macro.S
Loading
Please register or sign in to comment