aboutsummaryrefslogtreecommitdiff
path: root/net/ceph
diff options
context:
space:
mode:
authorLinus Torvalds2015-04-22 09:21:30 -0700
committerLinus Torvalds2015-04-22 09:21:30 -0700
commit2144de826e1eeac0c2e30a22029b3330d8bb813c (patch)
treeb852bfbc09b32a0c8ed9719243c6762b945131d2 /net/ceph
parente5ac320de1fe3ef5a5afa5f8a0cd19b0c5373a37 (diff)
parentb50c9c2de553102d42842db842f57c6cad676494 (diff)
Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC defconfig updates from Olof Johansson: "We keep collecting defconfig updates in a separate branch mostly to encourage people to handle them separately and avoid conflicts between different topics. Most of these are enablement of new drivers that have come in, or minor config refreshes due to reorderings in Kconfig files, etc. I.e. mostly minor churn of various kinds. We might start folding this branch into something else for upstream merge since it's so small, but keep it independent in our own tree for the above reasons" * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits) ARM: multi_v7_defconfig: enable alpine platform ARM: multi_v7_defconfig: Add gpio-restart driver ARM: multi_v7_defconfig: Build the Marvell WiFi-Ex driver as a module ARM: multi_v7_defconfig: Enable support for ELAN i2c trackpads ARM: multi_v7_defconfig: Enable Tegra ACTMON support ARM: configs: remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs ARM: configs: enable Marvell Armada 39x in multi_v7_defconfig ARM: exynos_defconfig: Enable HDMI support ARM: exynos_defconfig: Enable options to mount a rootfs via NFS ARM: qcom: Increase MMC_BLOCK_MINORS in defconfig ARM: mvebu: Enable perf support in mvebu_v7_defconfig ARM: exynos_defconfig: Enable ChromeOS EC chardev driver ARM: exynos_defconfig: Enable CPU idle ARM: exynos_defconfig: Enable Marvell WiFi-Ex support arm: qcom: Update defconfig arm: qcom: Enable lpass clock driver in defconfig ARM: omap2plus_defconfig: Enable n900 modem as loadable modules ARM: omap2plus_defconfig: Update bluetooth options ARM: omap2plus_defconfig: Enable leds-pwm ARM: omap1_defconfig: drop obsolete Kconfig symbols ...
Diffstat (limited to 'net/ceph')
0 files changed, 0 insertions, 0 deletions