linux-uconsole/include/uapi
Greg Kroah-Hartman a17a563d16 Merge 449dc8c970 ("Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply") into android-mainline
Merges along the way to 5.9-rc1

resolves conflicts in:
	Documentation/ABI/testing/sysfs-class-power
	drivers/power/supply/power_supply_sysfs.c
	fs/crypto/inline_crypt.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia087834f54fb4e5269d68c3c404747ceed240701
2020-08-08 13:07:20 +02:00
..
asm-generic Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next 2020-08-05 20:13:21 -07:00
drm Merge 7b4ea9456d ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline 2020-08-07 16:01:35 +02:00
linux Merge 449dc8c970 ("Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply") into android-mainline 2020-08-08 13:07:20 +02:00
misc habanalabs: Add dropped cs statistics info struct 2020-07-24 20:31:36 +03:00
mtd mtd: Add support for emulated SLC mode on MLC NANDs 2020-05-11 09:51:41 +02:00
rdma RDMA/efa: User/kernel compatibility handshake mechanism 2020-07-29 09:23:40 -03:00
scsi scsi: qla2xxx: Change in PUREX to handle FPIN ELS requests 2020-07-01 22:24:16 -04:00
sound ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHLT 2020-04-27 16:02:26 +01:00
video
xen xen/gntdev: gntdev.h: drop a duplicated word 2020-08-03 07:46:42 +02:00
Kbuild