mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-24 18:38:38 +00:00
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.
|
||
|---|---|---|
| .. | ||
| acquirewdt.c | ||
| advantechwdt.c | ||
| alim1535_wdt.c | ||
| alim7101_wdt.c | ||
| ar7_wdt.c | ||
| at32ap700x_wdt.c | ||
| at91rm9200_wdt.c | ||
| bfin_wdt.c | ||
| booke_wdt.c | ||
| cpu5wdt.c | ||
| davinci_wdt.c | ||
| ep93xx_wdt.c | ||
| eurotechwdt.c | ||
| geodewdt.c | ||
| hpwdt.c | ||
| i6300esb.c | ||
| ib700wdt.c | ||
| ibmasr.c | ||
| indydog.c | ||
| iop_wdt.c | ||
| it8712f_wdt.c | ||
| iTCO_vendor_support.c | ||
| iTCO_vendor.h | ||
| iTCO_wdt.c | ||
| ixp4xx_wdt.c | ||
| ixp2000_wdt.c | ||
| Kconfig | ||
| ks8695_wdt.c | ||
| machzwd.c | ||
| Makefile | ||
| mixcomwd.c | ||
| mpc8xxx_wdt.c | ||
| mpc5200_wdt.c | ||
| mpcore_wdt.c | ||
| mtx-1_wdt.c | ||
| mv64x60_wdt.c | ||
| omap_wdt.c | ||
| omap_wdt.h | ||
| pc87413_wdt.c | ||
| pcwd_pci.c | ||
| pcwd_usb.c | ||
| pcwd.c | ||
| pnx4008_wdt.c | ||
| rc32434_wdt.c | ||
| rdc321x_wdt.c | ||
| rm9k_wdt.c | ||
| s3c2410_wdt.c | ||
| sa1100_wdt.c | ||
| sb_wdog.c | ||
| sbc60xxwdt.c | ||
| sbc7240_wdt.c | ||
| sbc8360.c | ||
| sbc_epx_c3.c | ||
| sc520_wdt.c | ||
| sc1200wdt.c | ||
| scx200_wdt.c | ||
| shwdt.c | ||
| smsc37b787_wdt.c | ||
| softdog.c | ||
| txx9wdt.c | ||
| w83627hf_wdt.c | ||
| w83697hf_wdt.c | ||
| w83877f_wdt.c | ||
| w83977f_wdt.c | ||
| wafer5823wdt.c | ||
| wd501p.h | ||
| wdrtas.c | ||
| wdt285.c | ||
| wdt977.c | ||
| wdt_pci.c | ||
| wdt.c | ||