diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-07 10:08:14 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-07 10:08:14 +0100 |
| commit | a3ab07c642b2d75e645b1a07464291e325a496e0 (patch) | |
| tree | c5b423b58698a9c7b7a9545d085ab4e776fa610f /drivers/misc/apds990x.c | |
| parent | Merge tag 'mhi-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ma... (diff) | |
| parent | Linux 5.10-rc7 (diff) | |
| download | linux-a3ab07c642b2d75e645b1a07464291e325a496e0.tar.xz linux-a3ab07c642b2d75e645b1a07464291e325a496e0.zip | |
Merge 5.10-rc7 into char-misc-next
We want the fixes in here, and this resolves a merge issue with
drivers/misc/habanalabs/common/memory.c.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/apds990x.c')
0 files changed, 0 insertions, 0 deletions