Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

9dd24d4e

Commit 9dd24d4e authored 6 years ago by Herbert Xu

Downloads
- Plain Diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux next

Pull changes from Freescale SoC drivers tree that are required by
subsequent caam/qi2 patches.

parents cf64e495 afb77422

No related branches found

No related tags found

No related merge requests found

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

drivers/bus/fsl-mc/fsl-mc-allocator.c 11 additions, 0 deletions

drivers/bus/fsl-mc/fsl-mc-allocator.c
drivers/bus/fsl-mc/mc-io.c 13 additions, 0 deletions

drivers/bus/fsl-mc/mc-io.c
drivers/crypto/caam/caamalg_qi2.c 3 additions, 3 deletions

drivers/crypto/caam/caamalg_qi2.c
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c 5 additions, 4 deletions

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
drivers/soc/fsl/dpio/dpio-cmd.h 1 addition, 0 deletions

drivers/soc/fsl/dpio/dpio-cmd.h
drivers/soc/fsl/dpio/dpio-driver.c 24 additions, 17 deletions

drivers/soc/fsl/dpio/dpio-driver.c
drivers/soc/fsl/dpio/dpio-service.c 38 additions, 3 deletions

drivers/soc/fsl/dpio/dpio-service.c
drivers/soc/fsl/dpio/dpio.c 23 additions, 0 deletions

drivers/soc/fsl/dpio/dpio.c
drivers/soc/fsl/dpio/dpio.h 4 additions, 0 deletions

drivers/soc/fsl/dpio/dpio.h
include/linux/fsl/mc.h 1 addition, 0 deletions

include/linux/fsl/mc.h
include/soc/fsl/dpaa2-io.h 8 additions, 3 deletions

include/soc/fsl/dpaa2-io.h

with 131 additions and 30 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