Johannes Berg 1e1430d528 Merge remote-tracking branch 'net-next/master' into mac80211-next ... Resolve the merge conflict between Felix's/my and Toke's patches coming into the tree through net and mac80211-next respectively. Most of Felix's changes go away due to Toke's new infrastructure work, my patch changes to "goto begin" (the label wasn't there before) instead of returning NULL so flow control towards drivers is preserved better. Signed-off-by: Johannes Berg <johannes.berg@intel.com>		2016-10-04 09:46:44 +02:00
..
asm-generic	asm-generic: Drop renameat syscall from default list	2016-05-05 00:42:21 +02:00
drm	Merge tag 'topic/drm-misc-2016-07-22' of git://anongit.freedesktop.org/drm-intel into drm-next	2016-07-27 10:33:08 +10:00
linux	Merge remote-tracking branch 'net-next/master' into mac80211-next	2016-10-04 09:46:44 +02: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	Second round of merge items for 4.8	2016-08-04 20:26:31 -04:00
scsi
sound	ALSA: uapi: Add three missing header files to Kbuild file	2016-05-31 17:33:32 +02:00
video
xen	xen/evtchn: add IOCTL_EVTCHN_RESTRICT	2016-07-25 10:59:31 +01:00
Kbuild