path: root/.mailmap
diff options
authorLinus Torvalds <>2016-09-08 12:05:15 -0700
committerLinus Torvalds <>2016-09-08 12:05:15 -0700
commite8b3b45de89117729cdc1a6b29da85500e4af7db (patch)
tree572cc762e4a1eeb7732ac2048bed187496500a0f /.mailmap
parentd71f058617564750261b673ea9b3352382b9cde4 (diff)
parent95390e3290e8bf69091116e0d91b9754c0e93a24 (diff)
Merge tag 'armsoc-fixes' of git://
Pull ARM SoC fixes from Olof Johansson: "This is a slightly larger batch of fixes that we've been sitting on a few -rcs. Most of them are simple oneliners, but there are two sets that are slightly larger and worth pointing out: - A set of patches to OMAP to deal with hwmod for RTC on am33xx (beaglebone SoC, among others). It's the only clock that ever has a valid offset of 0, so a new flag needed introduction once this problem was discovered. - A collection of CCI fixes for performance counters discovered once people started using it on X-Gene CPUs" * tag 'armsoc-fixes' of git:// (37 commits) arm-cci: pmu: Fix typo in event name Revert "ARM: tegra: fix erroneous address in dts" ARM: dts: imx6qdl: Fix SPDIF regression ARM: imx6: add missing BM_CLPCR_BYPASS_PMIC_READY setting for imx6sx ARM: dts: imx7d-sdb: fix ti,x-plate-ohms property name ARM: dts: kirkwood: Fix PCIe label on OpenRD ARM: kirkwood: ib62x0: fix size of u-boot environment partition bus: arm-ccn: make event groups reliable bus: arm-ccn: fix hrtimer registration bus: arm-ccn: fix PMU interrupt flags ARM: tegra: Correct polarity for Tegra114 PMIC interrupt MAINTAINERS: add tree entry for ARM/UniPhier architecture ARM: sun5i: Fix typo in trip point temperature MAINTAINERS: Switch to account for Krzysztof Kozlowski ARM: imx6ul: populates platform device at .init_machine bus: arm-ccn: Add missing event attribute exclusions for host/guest bus: arm-ccn: Correct required arguments for XP PMU events bus: arm-ccn: Fix XP watchpoint settings bitmask bus: arm-ccn: Do not attempt to configure XPs for cycle counter bus: arm-ccn: Fix PMU handling of MN ...
Diffstat (limited to '.mailmap')
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 093a8ac..de22dae 100644
--- a/.mailmap
+++ b/.mailmap
@@ -88,6 +88,7 @@ Kay Sievers <>
Kenneth W Chen <>
Konstantin Khlebnikov <> <>
Koushik <>
+Krzysztof Kozlowski <> <>
Krzysztof Kozlowski <> <>
Kuninori Morimoto <>
Leonid I Ananiev <>
OpenPOWER on IntegriCloud