diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-01 13:17:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-01 13:17:43 -0700 |
| commit | 2faf962d90ca4c5ee7ba026b7351b1f74500bcdf (patch) | |
| tree | d9528d62d567c6d227c3c237387272964b095a8d /include/linux/jiffies.h | |
| parent | Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| parent | Merge tag 'tegra-for-4.3-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/defconfig (diff) | |
| download | linux-dev-2faf962d90ca4c5ee7ba026b7351b1f74500bcdf.tar.xz linux-dev-2faf962d90ca4c5ee7ba026b7351b1f74500bcdf.zip | |
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 mostly keep defconfigs updates on a separate branch due to their
tendency to conflict between platforms and this encourages more
careful separation of code changes and config changes.
Most updates here are minor tweaks, enabling new drivers for various
platforms, and so on. Renesas also removed one defconfig
(marzen_defconfig)"
* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
ARM: add TC2 PM support to multi_v7_defconfig
ARM: tegra: Update multi_v7_defconfig
ARM: tegra: Update default configuration
ARM: at91/defconfig: at91_dt: remove ARM_AT91_ETHER
ARM: at91/defconfig: at91_dt: enable DRM hlcdc support
ARM: at91: at91_dt_defconfig: enable ISI and ov2640 support
ARM: multi_v7_defconfig: Enable Allwinner P2WI, PWM, DMA_SUN6I, cryptodev
ARM: sunxi_defconfig: Enable DMA_SUN6I, P2WI, PWM, cryptodev, EXTCON, FHANDLE
ARM: shmobile: Enable fixed voltage regulator in shmobile_defconfig
ARM: multi_v7_defconfig: Select MX6UL and MX7D
ARM: prima2_defconfig: enable build for hwspinlock
ARM: prima2_defconfig: enable build for RTC
ARM: prima2_defconfig: enable build for misc input
ARM: prima2_defconfig: enable build for SiRFSoC SDHC host
ARM: prima2_defconfig: fix the outdated defconfig
ARM: imx_v6_v7_defconfig: Select CONFIG_IKCONFIG_PROC
ARM: defconfig: orion5x: add DT support
ARM: qcom_defconfig: Enable options for KS8851 ethernet
ARM: multi_v7_defconfig: Enable support for PWM Regulators
ARM: multi_v7_defconfig: Enable ST's PWM driver
...
Diffstat (limited to 'include/linux/jiffies.h')
0 files changed, 0 insertions, 0 deletions