diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-04 22:54:26 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-04 22:54:26 +0400 |
| commit | 4554c135a0a017f4cd96f7c0612cb7ca78c68d08 (patch) | |
| tree | 7233d0c493223fb3769c4dd0668bd8da4fd02241 /drivers/input/keyboard | |
| parent | 82bdc843c2be0ce199e8e247dfb2a17248cbd6c4 (diff) | |
| parent | 94ac27a54be6a14948f0a9b3f542b4ff1faac232 (diff) | |
| download | linux-4554c135a0a017f4cd96f7c0612cb7ca78c68d08.tar.xz | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
i.MX SDMA: Fix burstsize settings
ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only
dma: sh_dma: not all SH DMAC implementations support MEMCPY
at_hdmac: bugfix for enabling channel irq
dmaengine: fix missing 'cnt' in ?: in dmatest
Diffstat (limited to 'drivers/input/keyboard')
0 files changed, 0 insertions, 0 deletions