Stephen Rothwell 77a87824ed clocksource/drivers/clps_711x: fixup for "ARM: clps711x: ... Switch to MULTIPLATFORM" Missed conflict between commit c86f51737f ("ARM: clps711x: Switch to MULTIPLATFORM") from the arm-soc tree and commit 250e46aa3bb3 ("clocksource/drivers/clps_711x: Add the COMPILE_TEST option") from the clockevents tree. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2016-08-01 21:25:20 -04:00
..
boot	ARM: DT updates for v4.8	2016-08-01 18:37:45 -04:00
common	…
configs	ARM: SoC defconfig updates for v4.8	2016-08-01 18:30:44 -04:00
crypto	…
firmware	…
include	ARM: SoC platform updates for v4.8	2016-08-01 18:27:08 -04:00
kernel	DeviceTree update for 4.8:	2016-07-30 11:32:01 -07:00
kvm	…
lib	…
mach-alpine	…
mach-artpec	…
mach-asm9260	…
mach-aspeed	…
mach-at91	ARM: SoC platform updates for v4.8	2016-08-01 18:27:08 -04:00
mach-axxia	…
mach-bcm	ARM: DT updates for v4.8	2016-08-01 18:37:45 -04:00
mach-berlin	…
mach-clps711x	clocksource/drivers/clps_711x: fixup for "ARM: clps711x:	2016-08-01 21:25:20 -04:00
mach-cns3xxx	…
mach-davinci	ARM: SoC platform updates for v4.8	2016-08-01 18:27:08 -04:00
mach-digicolor	…
mach-dove	…
mach-ebsa110	…
mach-efm32	…
mach-ep93xx	…
mach-exynos	ARM: SoC driver updates for v4.8	2016-08-01 18:36:01 -04:00
mach-footbridge	…
mach-gemini	…
mach-highbank	…
mach-hisi	…
mach-imx	ARM: SoC platform updates for v4.8	2016-08-01 18:27:08 -04:00
mach-integrator	ARM: SoC cleanups for v4.8	2016-08-01 18:21:13 -04:00
mach-iop13xx	…
mach-iop32x	…
mach-iop33x	…
mach-ixp4xx	…
mach-keystone	ARM: SoC defconfig updates for v4.8	2016-08-01 18:30:44 -04:00
mach-ks8695	…
mach-lpc18xx	…
mach-lpc32xx	…
mach-mediatek	…
mach-meson	…
mach-mmp	…
mach-moxart	ARM: SoC cleanups for v4.8	2016-08-01 18:21:13 -04:00
mach-mv78xx0	…
mach-mvebu	ARM: SoC cleanups for v4.8	2016-08-01 18:21:13 -04:00
mach-mxs	ARM: SoC cleanups for v4.8	2016-08-01 18:21:13 -04:00
mach-netx	…
mach-nomadik	…
mach-nspire	DeviceTree update for 4.8:	2016-07-30 11:32:01 -07:00
mach-omap1	ARM: SoC platform updates for v4.8	2016-08-01 18:27:08 -04:00
mach-omap2	ARM: SoC driver updates for v4.8	2016-08-01 18:36:01 -04:00
mach-orion5x	ARM: SoC cleanups for v4.8	2016-08-01 18:21:13 -04:00
mach-oxnas	…
mach-picoxcell	ARM: SoC cleanups for v4.8	2016-08-01 18:21:13 -04:00
mach-prima2	ARM: SoC cleanups for v4.8	2016-08-01 18:21:13 -04:00
mach-pxa	…
mach-qcom	…
mach-realview	…
mach-rockchip	ARM: SoC cleanups for v4.8	2016-08-01 18:21:13 -04:00
mach-rpc	…
mach-s3c24xx	ARM: SoC cleanups for v4.8	2016-08-01 18:21:13 -04:00
mach-s3c64xx	ARM: SoC platform updates for v4.8	2016-08-01 18:27:08 -04:00
mach-s5pv210	…
mach-sa1100	…
mach-shmobile	ARM: SoC platform updates for v4.8	2016-08-01 18:27:08 -04:00
mach-socfpga	…
mach-spear	ARM: SoC cleanups for v4.8	2016-08-01 18:21:13 -04:00
mach-sti	…
mach-stm32	…
mach-sunxi	…
mach-tango	…
mach-tegra	ARM: SoC cleanups for v4.8	2016-08-01 18:21:13 -04:00
mach-u300	ARM: SoC cleanups for v4.8	2016-08-01 18:21:13 -04:00
mach-uniphier	…
mach-ux500	ARM: SoC driver updates for v4.8	2016-08-01 18:36:01 -04:00
mach-versatile	…
mach-vexpress	ARM: SoC cleanups for v4.8	2016-08-01 18:21:13 -04:00
mach-vt8500	ARM: SoC cleanups for v4.8	2016-08-01 18:21:13 -04:00
mach-w90x900	…
mach-zx	…
mach-zynq	…
mm	Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-07-29 13:55:30 -07:00
net	…
nwfpe	…
oprofile	…
plat-iop	…
plat-omap	…
plat-orion	…
plat-pxa	…
plat-samsung	ARM: SoC platform updates for v4.8	2016-08-01 18:27:08 -04:00
plat-versatile	…
probes	…
tools	…
vdso	…
vfp	…
xen	Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-07-29 13:55:30 -07:00
Kconfig	ARM: SoC platform updates for v4.8	2016-08-01 18:27:08 -04:00
Kconfig-nommu	…
Kconfig.debug	…
Makefile	ARM: SoC platform updates for v4.8	2016-08-01 18:27:08 -04:00