summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2021-11-02 09:04:22 +0000
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2021-11-02 09:04:22 +0000
commit11779842dd6f59505f5685bdd6ebaaa7a5bc1d94 (patch)
tree701acebeeef8d6ccd78515df95f2ff3108ea059e /scripts
parent8bb7eca972ad531c9b149c0a51ab43a417385813 (diff)
parentc1e42efacb9bb4ae873e9b1cf249fa4fb6ef7f84 (diff)
parent0e52fc2e7ddda78d9ced594a3bd0f840435a6560 (diff)
downloadlinux-11779842dd6f59505f5685bdd6ebaaa7a5bc1d94.tar.bz2
Merge branches 'devel-stable' and 'misc' into for-linus