Commit 3f30a09a612bac2b531a206c2a58a292dd7ff182
Committed by
Russell King
Russell King
Merge branch 'pxa-all' into devel
Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/corgi.c arch/arm/mach-pxa/include/mach/hardware.h arch/arm/mach-pxa/spitz.c
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
Showing 198 changed files Side-by-side Diff
- Documentation/sound/alsa/soc/dapm.txt
- MAINTAINERS
- arch/arm/Kconfig
- arch/arm/common/it8152.c
- arch/arm/common/locomo.c
- arch/arm/common/sharpsl_param.c
- arch/arm/configs/cm_x300_defconfig
- arch/arm/configs/palmz72_defconfig
- arch/arm/configs/viper_defconfig
- arch/arm/configs/xm_x270_defconfig
- arch/arm/configs/xm_x2xx_defconfig
- arch/arm/include/asm/mach/udc_pxa2xx.h
- arch/arm/kernel/ecard.c
- arch/arm/kernel/irq.c
- arch/arm/mach-at91/gpio.c
- arch/arm/mach-davinci/gpio.c
- arch/arm/mach-ep93xx/core.c
- arch/arm/mach-footbridge/isa-irq.c
- arch/arm/mach-h720x/common.c
- arch/arm/mach-h720x/cpu-h7202.c
- arch/arm/mach-imx/irq.c
- arch/arm/mach-integrator/integrator_cp.c
- arch/arm/mach-iop13xx/msi.c
- arch/arm/mach-ixp2000/core.c
- arch/arm/mach-ixp2000/ixdp2x00.c
- arch/arm/mach-ixp2000/ixdp2x01.c
- arch/arm/mach-ixp23xx/core.c
- arch/arm/mach-ixp23xx/ixdp2351.c
- arch/arm/mach-lh7a40x/arch-kev7a400.c
- arch/arm/mach-lh7a40x/arch-lpd7a40x.c
- arch/arm/mach-lh7a40x/common.h
- arch/arm/mach-lh7a40x/irq-lpd7a40x.c
- arch/arm/mach-netx/generic.c
- arch/arm/mach-ns9xxx/board-a9m9750dev.c
- arch/arm/mach-omap1/board-voiceblue.c
- arch/arm/mach-omap1/fpga.c
- arch/arm/mach-orion5x/irq.c
- arch/arm/mach-pxa/Kconfig
- arch/arm/mach-pxa/Makefile
- arch/arm/mach-pxa/akita-ioexp.c
- arch/arm/mach-pxa/am200epd.c
- arch/arm/mach-pxa/cm-x255.c
- arch/arm/mach-pxa/cm-x270-pci.c
- arch/arm/mach-pxa/cm-x270-pci.h
- arch/arm/mach-pxa/cm-x270.c
- arch/arm/mach-pxa/cm-x2xx-pci.c
- arch/arm/mach-pxa/cm-x2xx-pci.h
- arch/arm/mach-pxa/cm-x2xx.c
- arch/arm/mach-pxa/cm-x300.c
- arch/arm/mach-pxa/colibri.c
- arch/arm/mach-pxa/corgi.c
- arch/arm/mach-pxa/corgi_lcd.c
- arch/arm/mach-pxa/corgi_pm.c
- arch/arm/mach-pxa/corgi_ssp.c
- arch/arm/mach-pxa/cpu-pxa.c
- arch/arm/mach-pxa/cpufreq-pxa2xx.c
- arch/arm/mach-pxa/cpufreq-pxa3xx.c
- arch/arm/mach-pxa/devices.h
- arch/arm/mach-pxa/e330.c
- arch/arm/mach-pxa/e350.c
- arch/arm/mach-pxa/e400.c
- arch/arm/mach-pxa/e400_lcd.c
- arch/arm/mach-pxa/e740.c
- arch/arm/mach-pxa/e740_lcd.c
- arch/arm/mach-pxa/e750.c
- arch/arm/mach-pxa/e750_lcd.c
- arch/arm/mach-pxa/e800.c
- arch/arm/mach-pxa/e800_lcd.c
- arch/arm/mach-pxa/em-x270.c
- arch/arm/mach-pxa/eseries.c
- arch/arm/mach-pxa/eseries.h
- arch/arm/mach-pxa/eseries_udc.c
- arch/arm/mach-pxa/generic.c
- arch/arm/mach-pxa/generic.h
- arch/arm/mach-pxa/gpio.c
- arch/arm/mach-pxa/gumstix.c
- arch/arm/mach-pxa/idp.c
- arch/arm/mach-pxa/include/mach/akita.h
- arch/arm/mach-pxa/include/mach/corgi.h
- arch/arm/mach-pxa/include/mach/entry-macro.S
- arch/arm/mach-pxa/include/mach/hardware.h
- arch/arm/mach-pxa/include/mach/i2c.h
- arch/arm/mach-pxa/include/mach/irqs.h
- arch/arm/mach-pxa/include/mach/littleton.h
- arch/arm/mach-pxa/include/mach/memory.h
- arch/arm/mach-pxa/include/mach/mfp-pxa25x.h
- arch/arm/mach-pxa/include/mach/mfp-pxa320.h
- arch/arm/mach-pxa/include/mach/mfp.h
- arch/arm/mach-pxa/include/mach/mioa701.h
- arch/arm/mach-pxa/include/mach/ohci.h
- arch/arm/mach-pxa/include/mach/palmz72.h
- arch/arm/mach-pxa/include/mach/pm.h
- arch/arm/mach-pxa/include/mach/poodle.h
- arch/arm/mach-pxa/include/mach/pxa-regs.h
- arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
- arch/arm/mach-pxa/include/mach/spitz.h
- arch/arm/mach-pxa/include/mach/ssp.h
- arch/arm/mach-pxa/include/mach/trizeps4.h
- arch/arm/mach-pxa/include/mach/viper.h
- arch/arm/mach-pxa/irq.c
- arch/arm/mach-pxa/leds-trizeps4.c
- arch/arm/mach-pxa/leds.c
- arch/arm/mach-pxa/littleton.c
- arch/arm/mach-pxa/lpd270.c
- arch/arm/mach-pxa/lubbock.c
- arch/arm/mach-pxa/magician.c
- arch/arm/mach-pxa/mainstone.c
- arch/arm/mach-pxa/mfp-pxa2xx.c
- arch/arm/mach-pxa/mioa701.c
- arch/arm/mach-pxa/mioa701_bootresume.S
- arch/arm/mach-pxa/mp900.c
- arch/arm/mach-pxa/palmtx.c
- arch/arm/mach-pxa/palmz72.c
- arch/arm/mach-pxa/pcm027.c
- arch/arm/mach-pxa/pcm990-baseboard.c
- arch/arm/mach-pxa/pm.c
- arch/arm/mach-pxa/poodle.c
- arch/arm/mach-pxa/pxa25x.c
- arch/arm/mach-pxa/pxa27x.c
- arch/arm/mach-pxa/pxa3xx.c
- arch/arm/mach-pxa/sharpsl_pm.c
- arch/arm/mach-pxa/spitz.c
- arch/arm/mach-pxa/spitz_pm.c
- arch/arm/mach-pxa/time.c
- arch/arm/mach-pxa/trizeps4.c
- arch/arm/mach-pxa/viper.c
- arch/arm/mach-pxa/zylonite.c
- arch/arm/mach-pxa/zylonite_pxa300.c
- arch/arm/mach-pxa/zylonite_pxa320.c
- arch/arm/mach-s3c2410/bast-irq.c
- arch/arm/mach-s3c2412/irq.c
- arch/arm/mach-s3c2440/irq.c
- arch/arm/mach-s3c2443/irq.c
- arch/arm/mach-sa1100/irq.c
- arch/arm/mach-sa1100/neponset.c
- arch/arm/mach-versatile/core.c
- arch/arm/plat-omap/gpio.c
- arch/arm/plat-s3c24xx/irq.c
- arch/arm/plat-s3c24xx/s3c244x-irq.c
- drivers/hwmon/Kconfig
- drivers/hwmon/Makefile
- drivers/hwmon/max1111.c
- drivers/i2c/busses/i2c-pxa.c
- drivers/input/keyboard/corgikbd.c
- drivers/input/keyboard/spitzkbd.c
- drivers/input/keyboard/tosakbd.c
- drivers/input/touchscreen/Kconfig
- drivers/input/touchscreen/ads7846.c
- drivers/input/touchscreen/ucb1400_ts.c
- drivers/leds/Kconfig
- drivers/leds/Makefile
- drivers/leds/leds-corgi.c
- drivers/leds/leds-spitz.c
- drivers/media/video/pxa_camera.c
- drivers/mfd/Kconfig
- drivers/mfd/Makefile
- drivers/mfd/ucb1400_core.c
- drivers/mmc/host/pxamci.c
- drivers/mtd/nand/cmx270_nand.c
- drivers/net/irda/pxaficp_ir.c
- drivers/net/smc91x.h
- drivers/pcmcia/Kconfig
- drivers/pcmcia/Makefile
- drivers/pcmcia/pxa2xx_base.c
- drivers/pcmcia/pxa2xx_cm_x255.c
- drivers/pcmcia/pxa2xx_cm_x270.c
- drivers/pcmcia/pxa2xx_cm_x2xx.c
- drivers/pcmcia/pxa2xx_palmld.c
- drivers/pcmcia/pxa2xx_trizeps4.c
- drivers/pcmcia/pxa2xx_viper.c
- drivers/power/Kconfig
- drivers/power/Makefile
- drivers/power/palmtx_battery.c
- drivers/power/wm97xx_battery.c
- drivers/serial/pxa.c
- drivers/usb/host/ohci-pxa27x.c
- drivers/video/Kconfig
- drivers/video/Makefile
- drivers/video/am200epd.c
- drivers/video/backlight/Kconfig
- drivers/video/backlight/Makefile
- drivers/video/backlight/corgi_lcd.c
- drivers/video/backlight/lcd.c
- drivers/video/backlight/tdo24m.c
- drivers/video/fbmem.c
- drivers/video/metronomefb.c
- include/linux/lcd.h
- include/linux/smc91x.h
- include/linux/spi/ads7846.h
- include/linux/spi/corgi_lcd.h
- include/linux/ucb1400.h
- include/linux/wm97xx_batt.h
- include/video/metronomefb.h
- sound/arm/pxa2xx-ac97.c
- sound/soc/pxa/corgi.c
- sound/soc/pxa/pxa2xx-ac97.c
- sound/soc/pxa/pxa2xx-i2s.c
- sound/soc/pxa/spitz.c