mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 19:31:53 +00:00
6a57d104c8
This is the second batch of SoC updates for the 3.8 merge window, containing parts that had dependencies on earlier branches such that we couldn't include them with the first branch. These are general updates for Samsung Exynos, Renesas/shmobile and a topic branch that adds SMP support to Altera's socfpga platform. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQy5gxAAoJEIwa5zzehBx3ab0P/1SSJYLNcn8rieIALLZaSH17 lxVwyv/OMLmRual0eVjXN+mcNuAc05gemLUSNSrdFPrHhEGSqFz8x0C/A6o3Ovw/ OxNNX3rQiZP86vKRVmT/did7yEkMmleKng19uOyBXN2p7f6lh01Y5NFTVE1dWiZG TJPEgWI9mrarUMarL90fBu7AlXPNJwfG0opmT5QWuZmcLlaRXFTqFU2U08e5rPp5 9yrTn3fQCDx+eT7qUBiZfuH6sesMnofYWDNJSvV/aPI4UYsEcK6KyJUL8LBuTLQ7 9LHqsJNHLnlqxDsq6N/B0/pno2rhgdbkPPtl0c0xw35anHWW86IUgWgSCbu16LDZ uKDV31tIsx8yhsm8QkSKwzEjVnablhVYORGByVkNYBVSgMobdxBNFog6iX9NNQxJ 3Z1K0i65YPffDoK7CJorIxcxyvBuBR/KueUFpzEK05xzJlvhPK2NQSY5Je0qEaA3 tZYt0WfMtLC0huhLxEL/xNXuErqvj18kOSal3CHmg2LWVaKCFKNuY/B71yF7xaTc qN3RGJdb5Dyh49CCzXVBSAKJozc+pB8RauGnM//UQf49lmFzQ7oaQjxNjS3zQrjA 3LsbJ8cDbwWVKb8yRvR8BtnJl81yE58D6R/gEPjH33v4jRPLUONLyyhVI57Rf0tV SFjd8wRlsFakOQ4qnG/B =77Ct -----END PGP SIGNATURE----- Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM Soc updates, take 2, from Olof Johansson: "This is the second batch of SoC updates for the 3.8 merge window, containing parts that had dependencies on earlier branches such that we couldn't include them with the first branch. These are general updates for Samsung Exynos, Renesas/shmobile and a topic branch that adds SMP support to Altera's socfpga platform." Fix up conflicts mostly as per Olof. * tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: EXYNOS: Clock settings for SATA and SATA PHY ARM: EXYNOS: Add ARM down clock support ARM: EXYNOS: Fix i2c suspend/resume for legacy controller ARM: EXYNOS: Add aliases for i2c controller ARM: EXYNOS: Setup legacy i2c controller interrupts sh: clkfwk: fixup unsed variable warning Revert "ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode" Revert "ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode" Revert "ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode" ARM: highbank: use common debug_ll_io_init ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global ARM: shmobile: sh7372: remove fsidivx clock ARM: socfpga: mark secondary_trampoline as cpuinit socfpga: map uart into virtual address space so that early_printk() works ARM: socfpga: fix build break for allyesconfig ARM: socfpga: Enable SMP for socfpga ARM: EXYNOS: Add dp clock support for EXYNOS5 ARM: SAMSUNG: call clk_get_rate for debugfs rate files ARM: SAMSUNG: add clock_tree debugfs file in clock |
||
|---|---|---|
| .. | ||
| include/mach | ||
| clock-exynos4.c | ||
| clock-exynos4.h | ||
| clock-exynos5.c | ||
| clock-exynos4210.c | ||
| clock-exynos4212.c | ||
| common.c | ||
| common.h | ||
| cpuidle.c | ||
| dev-ahci.c | ||
| dev-audio.c | ||
| dev-ohci.c | ||
| dev-sysmmu.c | ||
| dev-uart.c | ||
| dma.c | ||
| headsmp.S | ||
| hotplug.c | ||
| Kconfig | ||
| mach-armlex4210.c | ||
| mach-exynos4-dt.c | ||
| mach-exynos5-dt.c | ||
| mach-nuri.c | ||
| mach-origen.c | ||
| mach-smdk4x12.c | ||
| mach-smdkv310.c | ||
| mach-universal_c210.c | ||
| Makefile | ||
| Makefile.boot | ||
| mct.c | ||
| platsmp.c | ||
| pm_domains.c | ||
| pm.c | ||
| pmu.c | ||
| setup-fimc.c | ||
| setup-fimd0.c | ||
| setup-i2c0.c | ||
| setup-i2c1.c | ||
| setup-i2c2.c | ||
| setup-i2c3.c | ||
| setup-i2c4.c | ||
| setup-i2c5.c | ||
| setup-i2c6.c | ||
| setup-i2c7.c | ||
| setup-keypad.c | ||
| setup-sdhci-gpio.c | ||
| setup-spi.c | ||
| setup-usb-phy.c | ||