diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-05 11:15:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-05 11:15:43 +0100 |
| commit | 4e6314e2ce48ce7bfc5397dc57f9bdb4ac91f506 (patch) | |
| tree | ba0e7eb50b1950d5dee4bf8a61995832dc55403a | |
| parent | 6514ad8fef693f2033f0135707cdbd49c7874737 (diff) | |
| parent | a8cbbef94789930aa696a9caed8549b8693d468e (diff) | |
| download | linux-crypto-4e6314e2ce48ce7bfc5397dc57f9bdb4ac91f506.tar.gz linux-crypto-4e6314e2ce48ce7bfc5397dc57f9bdb4ac91f506.zip | |
Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char-misc-next
This merges from linux-arm at 860660fd829e ("ARM: 9055/1: mailbox:
arm_mhuv2: make remove callback return void") into char-misc-next to get
the amba fixes from Uwe.
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
0 files changed, 0 insertions, 0 deletions