mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-15 19:56:03 +00:00
Merge branch 'dma' into devel
Conflicts: arch/arm/plat-mxc/dma-mx1-mx2.c
This commit is contained in:
commit
22b61a11fd
13 changed files with 292 additions and 238 deletions
Loading…
Add table
Add a link
Reference in a new issue