mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-26 03:17:48 +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.
|
||
|---|---|---|
| .. | ||
| .gitignore | ||
| armksyms.c | ||
| arthur.c | ||
| asm-offsets.c | ||
| atags.c | ||
| atags.h | ||
| bios32.c | ||
| calls.S | ||
| compat.c | ||
| compat.h | ||
| crunch-bits.S | ||
| crunch.c | ||
| debug.S | ||
| dma-isa.c | ||
| dma.c | ||
| ecard.c | ||
| ecard.h | ||
| elf.c | ||
| entry-armv.S | ||
| entry-common.S | ||
| entry-header.S | ||
| fiq.c | ||
| ftrace.c | ||
| head-common.S | ||
| head-nommu.S | ||
| head.S | ||
| init_task.c | ||
| io.c | ||
| irq.c | ||
| isa.c | ||
| iwmmxt.S | ||
| kgdb.c | ||
| kprobes-decode.c | ||
| kprobes.c | ||
| machine_kexec.c | ||
| Makefile | ||
| module.c | ||
| process.c | ||
| ptrace.c | ||
| ptrace.h | ||
| relocate_kernel.S | ||
| setup.c | ||
| signal.c | ||
| signal.h | ||
| smp.c | ||
| stacktrace.c | ||
| stacktrace.h | ||
| sys_arm.c | ||
| sys_oabi-compat.c | ||
| thumbee.c | ||
| time.c | ||
| traps.c | ||
| vmlinux.lds.S | ||
| xscale-cp0.c | ||