diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2017-10-18 15:55:44 +0200 |
|---|---|---|
| committer | Philipp Zabel <p.zabel@pengutronix.de> | 2017-10-18 15:59:30 +0200 |
| commit | 542befbb18056c4fda7b458aa6146a52b2fd389c (patch) | |
| tree | 5963eb9f0e4acda6ef6ac5cb3e82d83fafdd389f /drivers/soc/fsl/qbman/bman_priv.h | |
| parent | f0e0ada67dfd8342fd411da6e3bff10ff9bcc97b (diff) | |
| parent | 376349232a93645624426db782cafe688054e6d6 (diff) | |
Merge branch 'reset/arc' into reset/next
Merge the AXS10x driver, which is also merged into
git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git for-next
Diffstat (limited to 'drivers/soc/fsl/qbman/bman_priv.h')
0 files changed, 0 insertions, 0 deletions