mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-15 19:56:03 +00:00
Merge remote-tracking branch 'efi/chainsaw' into x86/efi
Resolved Conflicts: drivers/firmware/efivars.c fs/efivarsfs/file.c Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
commit
f53f292eea
11071 changed files with 608822 additions and 339946 deletions
37
fs/9p/acl.c
37
fs/9p/acl.c
20
fs/9p/acl.h
20
fs/9p/acl.h
71
fs/9p/fid.c
71
fs/9p/fid.c
22
fs/9p/fid.h
22
fs/9p/fid.h
34
fs/9p/v9fs.c
34
fs/9p/v9fs.c
10
fs/9p/v9fs.h
10
fs/9p/v9fs.h
11
fs/afs/afs.h
11
fs/afs/afs.h
10
fs/aio.c
10
fs/aio.c
2
fs/bio.c
2
fs/bio.c
150
fs/btrfs/ctree.h
150
fs/btrfs/ctree.h
100
fs/btrfs/file.c
100
fs/btrfs/file.c
1095
fs/btrfs/inode.c
1095
fs/btrfs/inode.c
284
fs/btrfs/ioctl.c
284
fs/btrfs/ioctl.c
502
fs/btrfs/ioctl.h
502
fs/btrfs/ioctl.h
2100
fs/btrfs/raid56.c
2100
fs/btrfs/raid56.c
20
fs/buffer.c
20
fs/buffer.c
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue