diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 15:33:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 15:33:25 -0700 |
| commit | 4e8a780ed6e1fdb8af203f61718212d5739bc4a0 (patch) | |
| tree | 2f3b28f400932d72c3940ff360a1be1fed8b0f87 /fs/aio.c | |
| parent | 90ff1f30c0f401e325d6b2747618b7e3a0addaf8 (diff) | |
| parent | 66ee3bef3ce0bab155de082805388bd6ec2785f8 (diff) | |
| download | op-kernel-dev-4e8a780ed6e1fdb8af203f61718212d5739bc4a0.zip op-kernel-dev-4e8a780ed6e1fdb8af203f61718212d5739bc4a0.tar.gz | |
Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (34 commits)
ARM: mach-shmobile: mackerel: add renesas_usbhs support for USB1
ARM: mach-shmobile: Correct the G4EVM SDHI0 I/O range.
ARM: arch-shmobile: sh7372: add renesas_usbhs irq support
ARM: mach-shmobile: sh73a0: mark DMA slave ID 0 as invalid
ARM: mach-shmobile: mark DMA slave ID 0 as invalid
ARM: mach-shmobile: Enable DMAEngine for SDHI on AG5EVM
ARM: mach-shmobile: Enable DMAEngine for MMCIF on AG5EVM
ARM: mach-shmobile: sh73a0 DMA Engine support for SY-DMAC
dmaengine: shdma: Update SH_DMAC_MAX_CHANNELS to 20
dmaengine: shdma: Fix SH_DMAC_MAX_CHANNELS handling
dmaengine: shdma: Make second memory window optional
ARM: mach-shmobile: Tidy up after SH7372 pm changes.
ARM: mach-shmobile: sh7372 Core Standby CPUIdle
ARM: mach-shmobile: CPUIdle support
ARM: mach-shmobile: sh7372 Core Standby Suspend-to-RAM
ARM: mach-shmobile: Suspend-to-RAM support
mailmap: Add entry for Damian Hobson-Garcia.
ARM: switch mackerel to dynamically manage the platform camera
ARM: mach-shmobile: Add SDHI support for AG5EVM and sh73a0
ARM: arch-shmobile: Use multiple irq vectors for SDHI
...
Diffstat (limited to 'fs/aio.c')
0 files changed, 0 insertions, 0 deletions
