Merge branch 'topic/of' into for-linus (b2396f79) · Commits · Clea OS / bsp / nxp / linux-seco-imx · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-seco-imx
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Jira
- Terraform modules
- Model experiments

Snippets Groups Projects

b2396f79

Commit b2396f79 authored 12 years ago by Vinod Koul

Downloads
- Plain Diff

Merge branch 'topic/of' into for-linus


Conflicts:
	include/linux/dmaengine.h

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

parents 42361f20 de61608a

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

drivers/dma/dmaengine.c 1 addition, 1 deletion

drivers/dma/dmaengine.c
drivers/dma/of-dma.c 30 additions, 66 deletions

drivers/dma/of-dma.c
include/linux/dmaengine.h 2 additions, 2 deletions

include/linux/dmaengine.h
include/linux/of_dma.h 4 additions, 6 deletions

include/linux/of_dma.h

with 37 additions and 75 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment