diff options
| author | Tejun Heo <tj@kernel.org> | 2024-08-05 10:56:49 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2024-08-05 10:56:49 -1000 |
| commit | bc3c27516ffd836485446219344b2b74a5efb483 (patch) | |
| tree | a4c3779fec782cf9ed18fa3a0e9ed61c6e4cb398 /drivers/fpga/fpga-mgr.c | |
| parent | 4980f712023a1c0c26a12f5212ced34587d81663 (diff) | |
| parent | ff0ce721ec213499ec5a532041fb3a1db2dc5ecb (diff) | |
Merge branch 'cgroup/for-6.11-fixes' into cgroup/for-6.12
cgroup/for-6.12 is about to receive updates that are dependent on changes
from both for-6.11-fixes and for-6.12. Pull in for-6.11-fixes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/fpga/fpga-mgr.c')
0 files changed, 0 insertions, 0 deletions