summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2024-05-16 12:35:01 +0100
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2024-05-16 12:35:01 +0100
commitf698d314eec2e16b980128b503d96bd73df77e90 (patch)
treeddd94a296b8a50424e58e996fdecf45452ca00eb /include/acpi
parentaff00427579d4c915ee92553f712e4c632185e6e (diff)
parent7b749aad1faa5bcb23b45b7126f677ab17324c40 (diff)
parent8d532528ff6a6b1bccf648d0f5713188e292ce8f (diff)
parenteebadafc3b14d9426fa9cc3ab0da0e48367c7114 (diff)
Merge branches 'amba', 'cfi', 'clkdev' and 'misc' into for-linusfor-linus