You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 7e5b2db77b Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus ... Pull MIPS updates from Ralf Baechle: "The whole series has been sitting in -next for quite a while with no complaints. The last change to the series was before the weekend the removal of an SPI patch which Grant - even though previously acked by himself - appeared to raise objections. So I removed it until the situation is clarified. Other than that all the patches have the acks from their respective maintainers, all MIPS and x86 defconfigs are building fine and I'm not aware of any problems introduced by this series. Among the key features for this patch series is a sizable patchset for Lantiq which among other things introduces support for Lantiq's flagship product, the FALCON SOC. It also means that the opensource developers behind this patchset have overtaken Lantiq's competing inhouse development team that was working behind closed doors. Less noteworthy the ath79 patchset which adds support for a few more chip variants, cleanups and fixes. Finally the usual dose of tweaking of generic code." Fix up trivial conflicts in arch/mips/lantiq/xway/gpio_{ebu,stp}.c where printk spelling fixes clashed with file move and eventual removal of the printk. * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (81 commits) MIPS: lantiq: remove orphaned code MIPS: Remove all -Wall and almost all -Werror usage from arch/mips. MIPS: lantiq: implement support for FALCON soc MTD: MIPS: lantiq: verify that the NOR interface is available on falcon soc MTD: MIPS: lantiq: implement OF support watchdog: MIPS: lantiq: implement OF support and minor fixes SERIAL: MIPS: lantiq: implement OF support GPIO: MIPS: lantiq: convert gpio-stp-xway to OF GPIO: MIPS: lantiq: convert gpio-mm-lantiq to OF and of_mm_gpio GPIO: MIPS: lantiq: move gpio-stp and gpio-ebu to the subsystem folder MIPS: pci: convert lantiq driver to OF MIPS: lantiq: convert dma to platform driver MIPS: lantiq: implement support for clkdev api MIPS: lantiq: drop ltq_gpio_request() and gpio_to_irq() OF: MIPS: lantiq: implement irq_domain support OF: MIPS: lantiq: implement OF support MIPS: lantiq: drop mips_machine support OF: PCI: const usage needed by MIPS MIPS: Cavium: Remove smp_reserve_lock. MIPS: Move cache setup to setup_arch(). ...		13 years ago
..
Kconfig	GPIO driver changes for v3.5 merge window	13 years ago
Makefile	GPIO driver changes for v3.5 merge window	13 years ago
address.c	ARM: spear: remove most mach/*.h header contents	13 years ago
base.c	dt: add property iteration helpers	13 years ago
device.c	drivercore: Output common devicetree information in uevent	13 years ago
fdt.c	of/fdt.c: asm/setup.h included twice	13 years ago
irq.c	of/irq: Add interrupts-names property to name an irq resource	13 years ago
of_i2c.c	of/i2c: implement of_find_i2c_adapter_by_node	13 years ago
of_mdio.c	netdev/of/phy: New function: of_mdio_find_bus().	13 years ago
of_mtd.c	of/mtd/nand: add generic bindings and helpers	13 years ago
of_net.c	drivers/of: include export.h for EXPORT_SYMBOL_GPL/THIS_MODULE as required	13 years ago
of_pci.c	of: of_pci.c needs export.h since it uses EXPORT_SYMBOLS	13 years ago
of_pci_irq.c	OF: PCI: const usage needed by MIPS	13 years ago
pdt.c	of/pdt: fix section mismatch warning	13 years ago
platform.c	Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm	13 years ago
selftest.c	of: Add of_property_match_string() to find index into a string list	13 years ago