diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-04-13 08:45:19 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-04-13 08:45:19 +1000 |
| commit | 13a060e1ed6276d2c28e911d9f9abd6e323c6452 (patch) | |
| tree | 98f4549460a626f16cda67d6e603f8a02c618e43 /include/uapi/linux/major.h | |
| parent | c275e276db08c42d538ff36f364f59c4b78587c1 (diff) | |
| parent | 1e91a92b9af5289ff45c96075ea002c76b675574 (diff) | |
| download | linux-next-13a060e1ed6276d2c28e911d9f9abd6e323c6452.tar.gz | |
Merge remote-tracking branch 'arm64/for-next/core'
# Conflicts:
# arch/arm64/include/asm/cpucaps.h
Diffstat (limited to 'include/uapi/linux/major.h')
0 files changed, 0 insertions, 0 deletions