forked from luck/tmp_suning_uos_patched
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.
|
||
|---|---|---|
| .. | ||
| include/mach | ||
| addr-map.c | ||
| common.c | ||
| common.h | ||
| db88f5281-setup.c | ||
| dns323-setup.c | ||
| edmini_v2-setup.c | ||
| gpio.c | ||
| irq.c | ||
| Kconfig | ||
| kurobox_pro-setup.c | ||
| lsmini-setup.c | ||
| Makefile | ||
| Makefile.boot | ||
| mpp.c | ||
| mpp.h | ||
| mss2-setup.c | ||
| mv2120-setup.c | ||
| pci.c | ||
| rd88f5181l-fxo-setup.c | ||
| rd88f5181l-ge-setup.c | ||
| rd88f5182-setup.c | ||
| rd88f6183ap-ge-setup.c | ||
| terastation_pro2-setup.c | ||
| ts78xx-setup.c | ||
| ts209-setup.c | ||
| ts409-setup.c | ||
| tsx09-common.c | ||
| tsx09-common.h | ||
| wnr854t-setup.c | ||
| wrt350n-v2-setup.c | ||