diff options
| author | Ingo Molnar <mingo@kernel.org> | 2022-01-08 10:53:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-01-08 10:53:57 +0100 |
| commit | 0422fe2666aea4c0986f4c89dc107731aa6a7a81 (patch) | |
| tree | 1d42a146a738fb933f061424751755e630aeccb0 /drivers/input/touchscreen/wm831x-ts.c | |
| parent | net/mlx4: Use irq_update_affinity_hint() (diff) | |
| parent | Merge branch 'for-5.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-0422fe2666aea4c0986f4c89dc107731aa6a7a81.tar.xz linux-0422fe2666aea4c0986f4c89dc107731aa6a7a81.zip | |
Merge branch 'linus' into irq/core, to fix conflict
Conflicts:
drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/input/touchscreen/wm831x-ts.c')
0 files changed, 0 insertions, 0 deletions