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 | 0573d3fa48640f0fa6b105ff92dcb02b94d6c1ab (patch) | |
tree | 9ec7ef79856a7aff2d4230adcaa9073d20919afb /block | |
parent | Merge tag 'icc-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dja... (diff) | |
parent | ARM: 9055/1: mailbox: arm_mhuv2: make remove callback return void (diff) | |
download | linux-0573d3fa48640f0fa6b105ff92dcb02b94d6c1ab.tar.xz linux-0573d3fa48640f0fa6b105ff92dcb02b94d6c1ab.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>
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions