Greg Kroah-Hartman da171b5d56 ANDROID: Revert "ANDROID: ASoC: core - add hostless DAI support" ... It causes too many conflicts with the 5.7-rc1 merge, it needs to be added back later, if this really is still needed. Given that it is not upstream, I doubt it really is needed anymore... Bug: 144369166 Cc: Liam Girdwood <lrg@slimlogic.co.uk> Cc: Patrick Lai <plai@codeaurora.org> Cc: Banajit Goswami <bgoswami@codeaurora.org> Cc: Meng Wang <mwang@codeaurora.org> Cc: Gopikrishnaiah Anandan <agopik@codeaurora.org> Cc: Neema Shetty <nshetty@codeaurora.org> Cc: Vidyakumar Athota <vathota@codeaurora.org> Cc: Anish Kumar <kanish@codeaurora.org> Cc: Shiv Maliyappanahalli <smaliyap@codeaurora.org> Cc: Sudheer Papothi <spapothi@codeaurora.org> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Iafa9f1e6f76e0a16945867070aab2c9916f7a450		2020-04-07 16:20:49 +02:00
..
acpi	Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2020-03-30 16:17:15 -07:00
asm-generic	Merge 1a323ea535 ("x86: get rid of 'errret' argument to __get_user_xyz() macross") into android-mainline	2020-04-04 12:17:50 +02:00
clocksource	clocksource/drivers/timer-ti-dm: Implement cpu_pm notifier for context save and restore	2020-03-16 12:40:29 +01:00
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2020-04-01 14:47:40 -07:00
drm	Merge f365ab31ef ("Merge tag 'drm-next-2020-04-01' of git://anongit.freedesktop.org/drm/drm") into android-mainline	2020-04-06 11:56:20 +02:00
dt-bindings	media updates for v5.7-rc1	2020-03-30 13:42:05 -07:00
keys	…
kunit	kunit: subtests should be indented 4 spaces according to TAP	2020-03-26 14:08:41 -06:00
kvm	irqchip/gic-v4.1: Move doorbell management to the GICv4 abstraction layer	2020-03-24 12:15:51 +00:00
linux	Merge 9c577491b9 ("Merge branch 'work.dotdot1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs") into android-mainline	2020-04-07 10:07:34 +02:00
math-emu	…
media	Merge 458ef2a25e Merge tag 'x86-timers-2020-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into android-mainline	2020-03-31 14:01:10 +02:00
misc	…
net	Merge 1a323ea535 ("x86: get rid of 'errret' argument to __get_user_xyz() macross") into android-mainline	2020-04-04 12:17:50 +02:00
pcmcia	…
ras	…
rdma	IB/mlx5: Expose UAR object and its alloc/destroy commands	2020-03-27 12:59:04 -03:00
scsi	scsi: simplify scsi_partsize	2020-03-24 07:57:07 -06:00
soc	net: dsa: felix: add port policers	2020-03-30 11:44:00 -07:00
sound	ANDROID: Revert "ANDROID: ASoC: core - add hostless DAI support"	2020-04-07 16:20:49 +02:00
target	…
trace	Merge 1a323ea535 ("x86: get rid of 'errret' argument to __get_user_xyz() macross") into android-mainline	2020-04-04 12:17:50 +02:00
uapi	Merge 9c577491b9 ("Merge branch 'work.dotdot1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs") into android-mainline	2020-04-07 10:07:34 +02:00
vdso	vdso: Fix clocksource.h macro detection	2020-03-23 18:51:08 +01:00
video	…
xen	…