7cc4e87f91
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
[ARM] 5300/1: fixup spitz reset during boot
[ARM] 5295/1: make ZONE_DMA optional
[ARM] 5239/1: Palm Zire 72 power management support
[ARM] 5298/1: Drop desc_handle_irq()
[ARM] 5297/1: [KS8695] Fix two compile-time warnings
[ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
[ARM] pxa: allow multi-machine PCMCIA builds
[ARM] pxa: add preliminary CPUFREQ support for PXA3xx
[ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
[ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
[ARM] pxa/zylonite: add support for USB OHCI
[ARM] ohci-pxa27x: use ioremap() and offset for register access
[ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
[ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
[ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
[ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
[ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
[ARM] pxa: simplify DMA register definitions
[ARM] pxa: make additional DCSR bits valid for PXA3xx
[ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
...
Fixed up conflicts in
arch/arm/mach-versatile/core.c
sound/soc/pxa/pxa2xx-ac97.c
sound/soc/pxa/pxa2xx-i2s.c
manually.
|
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| i2c-acorn.c | ||
| i2c-ali15x3.c | ||
| i2c-ali1535.c | ||
| i2c-ali1563.c | ||
| i2c-amd756-s4882.c | ||
| i2c-amd756.c | ||
| i2c-amd8111.c | ||
| i2c-at91.c | ||
| i2c-au1550.c | ||
| i2c-bfin-twi.c | ||
| i2c-cpm.c | ||
| i2c-davinci.c | ||
| i2c-elektor.c | ||
| i2c-gpio.c | ||
| i2c-hydra.c | ||
| i2c-i801.c | ||
| i2c-ibm_iic.c | ||
| i2c-ibm_iic.h | ||
| i2c-iop3xx.c | ||
| i2c-iop3xx.h | ||
| i2c-isch.c | ||
| i2c-ixp2000.c | ||
| i2c-mpc.c | ||
| i2c-mv64xxx.c | ||
| i2c-nforce2-s4985.c | ||
| i2c-nforce2.c | ||
| i2c-ocores.c | ||
| i2c-omap.c | ||
| i2c-parport-light.c | ||
| i2c-parport.c | ||
| i2c-parport.h | ||
| i2c-pasemi.c | ||
| i2c-pca-isa.c | ||
| i2c-pca-platform.c | ||
| i2c-piix4.c | ||
| i2c-pmcmsp.c | ||
| i2c-pnx.c | ||
| i2c-powermac.c | ||
| i2c-pxa.c | ||
| i2c-s3c2410.c | ||
| i2c-sh7760.c | ||
| i2c-sh_mobile.c | ||
| i2c-sibyte.c | ||
| i2c-simtec.c | ||
| i2c-sis96x.c | ||
| i2c-sis630.c | ||
| i2c-sis5595.c | ||
| i2c-stub.c | ||
| i2c-taos-evm.c | ||
| i2c-tiny-usb.c | ||
| i2c-versatile.c | ||
| i2c-via.c | ||
| i2c-viapro.c | ||
| i2c-voodoo3.c | ||
| scx200_acb.c | ||
| scx200_i2c.c | ||