Commit 9bc9ba0d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3e406741 ("Merge tag 'vfs-6.16-rc1.selftests' of...

Merge 3e406741 ("Merge tag 'vfs-6.16-rc1.selftests' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs"

) into android-mainline

Steps on the way to 6.16-rc1

Resolves merge conflicts in:
	kernel/power/suspend.c

Change-Id: I23797b16a50181a18a0226d4fbd8bbcd1e929454
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 1fcf907c 3e406741
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment