Merge 2fcd8f10 ("Merge tag 'clk-for-linus' of...

Merge 2fcd8f10 ("Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux"

) into android-mainline

Steps on the way to 6.1-rc1

Resolves merge conflicts in:
	drivers/clk/clk.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I297a74b292ab84646a3051d502965a929260754d