mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 05:01:48 +00:00
efff0471b0
Pull arm fixes for ux500 mismerge mishap from Arnd Bergmann: "The device tree conversion for arm/ux500 in 3.5 turns out to be incomplete because of a mismerge done by Linus Walleij that I failed to notice early enough and that Lee Jones as the original author of those patches did not manage to fix during the -next cycle. While we originally to get a much larger set of ux500 device tree enablement patches merged, this did not happen in time. After some discussion at Linaro Connect conference this week, Lee has been able to do damage control and provide a series to put the broken platform back into usable shape for both DT and non-DT based booting. This series has not been part of linux-next and is based on top of the current state of the upstream kernel rather than an -rc, but this is the best we could manage given the earlier breakage." * 'ux500/hickup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: ux500: Enable probing of pinctrl through Device Tree ARM: ux500: Add support for ab8500 regulators into the Device Tree ARM: ux500: Provide regulator support for SMSC911x via Device Tree ARM: ux500: Allow PRCMU regulator to be probed during a DT enabled boot ARM: ux500: Apply db8500-prcmu regulator information to db8500 Device Tree ARM: ux500: Only initialise STE's UIBs on boards which support them ARM: ux500: Disable platform setup of the ab8500 when DT is enabled ARM: ux500: Use correct format for dynamic IRQ assignment ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots ARM: ux500: PRCMU related configuration and layout corrections for Device Tree ARM: ux500: Remove DB8500 PRCMU platform registration when DT is enabled ARM: ux500: Disable SMSC911x platform code registration when DT is enabled ARM: ux500: New DT:ed u8500_init_devices for one-by-one device enablement ARM: ux500: New DT:ed snowball_platform_devs for one-by-one device enablement pinctrl-nomadik: Allow Device Tree driver probing |
||
|---|---|---|
| .. | ||
| boot | ||
| common | ||
| configs | ||
| include/asm | ||
| kernel | ||
| lib | ||
| mach-at91 | ||
| mach-bcmring | ||
| mach-clps711x | ||
| mach-cns3xxx | ||
| mach-davinci | ||
| mach-dove | ||
| mach-ebsa110 | ||
| mach-ep93xx | ||
| mach-exynos | ||
| mach-footbridge | ||
| mach-gemini | ||
| mach-h720x | ||
| mach-highbank | ||
| mach-imx | ||
| mach-integrator | ||
| mach-iop13xx | ||
| mach-iop32x | ||
| mach-iop33x | ||
| mach-ixp4xx | ||
| mach-kirkwood | ||
| mach-ks8695 | ||
| mach-l7200/include/mach | ||
| mach-lpc32xx | ||
| mach-mmp | ||
| mach-msm | ||
| mach-mv78xx0 | ||
| mach-mxs | ||
| mach-netx | ||
| mach-nomadik | ||
| mach-omap1 | ||
| mach-omap2 | ||
| mach-orion5x | ||
| mach-picoxcell | ||
| mach-pnx4008 | ||
| mach-prima2 | ||
| mach-pxa | ||
| mach-realview | ||
| mach-rpc | ||
| mach-s3c24xx | ||
| mach-s3c64xx | ||
| mach-s3c2410 | ||
| mach-s3c2412 | ||
| mach-s3c2440 | ||
| mach-s5p64x0 | ||
| mach-s5pc100 | ||
| mach-s5pv210 | ||
| mach-sa1100 | ||
| mach-shark | ||
| mach-shmobile | ||
| mach-spear3xx | ||
| mach-spear6xx | ||
| mach-spear13xx | ||
| mach-tegra | ||
| mach-u300 | ||
| mach-ux500 | ||
| mach-versatile | ||
| mach-vexpress | ||
| mach-vt8500 | ||
| mach-w90x900 | ||
| mach-zynq | ||
| mm | ||
| net | ||
| nwfpe | ||
| oprofile | ||
| plat-iop | ||
| plat-mxc | ||
| plat-nomadik | ||
| plat-omap | ||
| plat-orion | ||
| plat-pxa | ||
| plat-s3c24xx | ||
| plat-samsung | ||
| plat-spear | ||
| plat-versatile | ||
| tools | ||
| vfp | ||
| Kconfig | ||
| Kconfig-nommu | ||
| Kconfig.debug | ||
| Makefile | ||