David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of easy overlapping changes in the confict resolutions here. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-26 19:46:15 -04:00
..
boot	Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm	2018-05-20 11:50:27 -07:00
common
configs
crypto
firmware
include	Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm	2018-05-20 11:50:27 -07:00
kernel	ARM: 8771/1: kprobes: Prohibit kprobes on do_undefinstr	2018-05-19 11:35:56 +01:00
kvm
lib	ARM: 8772/1: kprobes: Prohibit kprobes on get_user functions	2018-05-19 11:35:56 +01:00
mach-actions
mach-alpine
mach-artpec
mach-asm9260
mach-aspeed
mach-at91
mach-axxia
mach-bcm
mach-berlin
mach-clps711x
mach-cns3xxx
mach-davinci
mach-digicolor
mach-dove
mach-ebsa110
mach-efm32
mach-ep93xx
mach-exynos
mach-footbridge
mach-gemini
mach-highbank
mach-hisi
mach-imx
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-keystone
mach-ks8695
mach-lpc18xx
mach-lpc32xx
mach-mediatek
mach-meson
mach-mmp
mach-moxart
mach-mv78xx0
mach-mvebu
mach-mxs
mach-netx
mach-nomadik
mach-npcm
mach-nspire
mach-omap1
mach-omap2
mach-orion5x
mach-oxnas
mach-picoxcell
mach-prima2
mach-pxa
mach-qcom
mach-realview
mach-rockchip
mach-rpc
mach-s3c24xx
mach-s3c64xx
mach-s5pv210
mach-sa1100
mach-shmobile
mach-socfpga
mach-spear
mach-sti
mach-stm32
mach-sunxi
mach-tango
mach-tegra
mach-u300
mach-uniphier
mach-ux500
mach-versatile
mach-vexpress
mach-vt8500
mach-w90x900
mach-zx
mach-zynq
mm	Revert "mm/cma: manage the memory of the CMA area by using the ZONE_MOVABLE"	2018-05-24 10:07:50 -07:00
net
nwfpe
oprofile
plat-iop
plat-omap
plat-orion
plat-pxa
plat-samsung
plat-versatile
probes	ARM: 8770/1: kprobes: Prohibit probing on optimized_callback	2018-05-19 11:35:56 +01:00
tools
vdso
vfp	ARM: fix kill( ,SIGFPE) breakage	2018-05-19 18:49:43 +01:00
xen
Kconfig
Kconfig-nommu
Kconfig.debug
Makefile