commit 622242b2522c1d26d1e6386912cfdc59b627083c
Merge: ef1e8911e 157041574
Author: Miran Grča <oubattler@gmail.com>
Date:   Thu Apr 9 09:53:18 2026 +0200

    Merge pull request #7032 from MaxwellS04/Conflict_Fixes
    
    TVGA8900: Fix a 'internal_name' conflict
