Merge 95124339 ("Merge tag 'clk-for-linus' of...

Merge 95124339 ("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 5.18-rc1

Resolves conflicts in:
	drivers/clk/clk.c

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