diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-09 14:46:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-09 14:46:36 -0800 |
| commit | b1f368b58b3c8095de4cff9eeb69babffab4e3d3 (patch) | |
| tree | efd28998e71ad2a5433ca79e858a2cfc71f30a2d /drivers/char/i8k.c | |
| parent | a3157809772c4a5256ef68a4d5b21ea4ecc80ad4 (diff) | |
| parent | 92c9e0c780e61f821ab8a08f0d4d4fd33ba1197c (diff) | |
Merge tag 'armsoc-for-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"Another quiet week:
- a fix to silence edma probe error on non-supported platforms from
Arnd
- a fix to enable the PL clock for Parallella, to make mainline
usable with the SDK.
- a somewhat verbose fix for the PLL clock tree on VF610
- enabling of SD/MMC on one of the VF610-based boards (for testing)
- a fix for i.MX where CONFIG_SPI used to be implicitly enabled and
now needs to be added to the defconfig instead
- another maintainer added for bcm2835: Lee Jones"
* tag 'armsoc-for-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: dts: zynq: Enable PL clocks for Parallella
dma: edma: move device registration to platform code
ARM: dts: vf610: add SD node to cosmic dts
MAINTAINERS: update bcm2835 entry
ARM: imx: Fix the removal of CONFIG_SPI option
ARM: imx: clk-vf610: define PLL's clock tree
Diffstat (limited to 'drivers/char/i8k.c')
0 files changed, 0 insertions, 0 deletions