Victor Wan cc7b1eac54 Merge branch 'android-4.9' into amlogic-4.9-dev ...

Signed-off-by: Victor Wan <victor.wan@amlogic.com>

 Conflicts:
	drivers/md/dm-bufio.c
	drivers/media/dvb-core/dvb_frontend.c
	drivers/usb/dwc3/core.c
	drivers/usb/gadget/function/f_fs.c

2018-08-07 14:43:24 +08:00

..

asm-generic

BACKPORT [FROMLIST] New getsockopt option to get socket cookie

2017-05-31 00:53:04 +00:00

drm

Merge branch 'android-4.9' into amlogic-4.9-dev

2018-08-07 14:43:24 +08:00

linux

Merge branch 'android-4.9' into amlogic-4.9-dev

2018-08-07 14:43:24 +08:00

misc

cxl: Use fixed width predefined types in data structure.

2016-08-09 16:52:01 +10:00

mtd

mtd: kill the nand_ecclayout struct

2016-05-05 23:51:51 +02:00

rdma

IB/cxgb3: fix misspelling in header guard

2017-02-01 08:33:07 +01:00

scsi

scsi: cxlflash: Transition to application close model

2016-08-23 22:23:41 -04:00

sound

Merge remote-tracking branch 'asoc/fix/topology-abi' into asoc-linus

2016-11-04 12:34:05 -06:00

video

UAPI: (Scripted) Disintegrate include/video

2012-12-20 17:14:26 +00:00

xen

xen/evtchn: add IOCTL_EVTCHN_RESTRICT

2016-07-25 10:59:31 +01:00

Kbuild

cxl: Add userspace header file

2014-10-08 20:15:57 +11:00