aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/cputime.h
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-04-20 07:59:04 -0700
committerOlof Johansson <olof@lixom.net>2015-04-20 07:59:04 -0700
commitcdaa8cf34863028dab238e1498555bf12d693244 (patch)
tree0034305d152c3c4887b81c8983d0f298e6e3f6cb /arch/s390/include/asm/cputime.h
parentMerge tag 'samsung-fixes-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical (diff)
parentARM: at91/dt: sama5d3 xplained: add phy address for macb1 (diff)
downloadlinux-dev-cdaa8cf34863028dab238e1498555bf12d693244.tar.xz
linux-dev-cdaa8cf34863028dab238e1498555bf12d693244.zip
Merge branch 'fixes' into next/fixes-non-critical
Merge a set of fixes that we missed sending in before v4.0 release. These will also be sent to -stable. * fixes: (659 commits) ARM: at91/dt: sama5d3 xplained: add phy address for macb1 kbuild: Create directory for target DTB ARM: mvebu: Disable CPU Idle on Armada 38x arm64: juno: Fix misleading name of UART reference clock ARM: dts: sunxi: Remove overclocked/overvoltaged OPP ARM: dts: sun4i: a10-lime: Override and remove 1008MHz OPP setting ARM: socfpga: dts: fix spi1 interrupt ARM: dts: Fix gpio interrupts for dm816x ARM: dts: dra7: remove ti,hwmod property from pcie phy ARM: EXYNOS: Fix build breakage cpuidle on !SMP ARM: OMAP: dmtimer: disable pm runtime on remove ARM: OMAP: dmtimer: check for pm_runtime_get_sync() failure ARM: dts: fix lid and power pin-functions for exynos5250-spring ARM: dts: fix mmc node updates for exynos5250-spring ARM: OMAP2+: Fix socbus family info for AM33xx devices ARM: dts: omap3: Add missing dmas for crypto + Linux 4.0-rc4 Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/s390/include/asm/cputime.h')
0 files changed, 0 insertions, 0 deletions