diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-05 01:48:55 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-05 01:49:22 +0400 |
| commit | 330641ceba8e60da8955109341401819acbf185e (patch) | |
| tree | 6963ab76202a30b380a25a620725ec2d148ac252 /arch/arm/mach-shmobile/clock-r8a7740.c | |
| parent | 631675692201111c06b5cf004fd519d136c80ab5 (diff) | |
| parent | a5c6e87a7b224bdbf57875a9da8f340f5a6abc5a (diff) | |
| download | linux-330641ceba8e60da8955109341401819acbf185e.tar.xz | |
Merge commit 'fixes' into next/cleanup
Merging in post-rc1 fixes that have gone into rc2/3 to avoid later conflicts.
* commit 'fixes': (39 commits)
arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk
arm: socfpga: Enable ARM_TWD for socfpga
ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS=16
ARM: sunxi_defconfig: enable NFS, TMPFS, PRINTK_TIME and nfsroot support
ARM: multi_v7_defconfig: enable network for BeagleBone Black
ARM: dts: Fix the name of supplies for smsc911x shared by OMAP
ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm
ARM: dts: omap3-beagle: Add omap-twl4030 audio support
ARM: dts: omap4-sdp: Fix pin muxing for wl12xx
ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx
ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM
ARM: at91: add usart3 alias to dtsi
ARM: at91: sama5d3: reduce TWI internal clock frequency
mmc: omap: Fix I2C dependency and make driver usable with device tree
mmc: omap: Fix DMA configuration to not rely on device id
ARM: dts: omap3-beagle: Fix USB host on beagle boards (for 3.13)
ARM: dts: omap3-igep0020: name twl4030 VPLL2 regulator as vdds_dsi
ARM: dts: AM33XX IGEP0033: add USB support
ARM: dts: AM33XX BASE0033: add 32KBit EEPROM support
ARM: dts: AM33XX BASE0033: add pinmux and user led support
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/clock-r8a7740.c')
0 files changed, 0 insertions, 0 deletions