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 cdfc83075f Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus ... Pull MIPS updates from Ralf Baechle: "The most notable new addition inside this pull request is the support for MIPS's latest and greatest core called "inter/proAptiv". The patch series describes this core as follows. "The interAptiv is a power-efficient multi-core microprocessor for use in system-on-chip (SoC) applications. The interAptiv combines a multi-threading pipeline with a coherence manager to deliver improved computational throughput and power efficiency. The interAptiv can contain one to four MIPS32R3 interAptiv cores, system level coherence manager with L2 cache, optional coherent I/O port, and optional floating point unit." The platform specific patches touch all 3 Broadcom families. It adds support for the new Broadcom/Netlogix XLP9xx Soc, building a common BCM63XX SMP kernel for all BCM63XX SoCs regardless of core type/count and full gpio button/led descriptions for BCM47xx. The rest of the series are cleanups and bug fixes that are MIPS generic and consist largely of changes that Imgtec/MIPS had published in their linux-mti-3.10.git stable tree. Random other cleanups and patches preparing code to be merged in 3.15" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (139 commits) mips: select ARCH_MIGHT_HAVE_PC_SERIO mips: delete non-required instances of include <linux/init.h> MIPS: KVM: remove shadow_tlb code MIPS: KVM: use common EHINV aware UNIQUE_ENTRYHI mips/ide: flush dcache also if icache does not snoop dcache MIPS: BCM47XX: fix position of cpu_wait disabling MIPS: BCM63XX: select correct MIPS_L1_CACHE_SHIFT value MIPS: update MIPS_L1_CACHE_SHIFT based on MIPS_L1_CACHE_SHIFT_<N> MIPS: introduce MIPS_L1_CACHE_SHIFT_<N> MIPS: ZBOOT: gather string functions into string.c arch/mips/pci: don't check resource with devm_ioremap_resource arch/mips/lantiq/xway: don't check resource with devm_ioremap_resource bcma: gpio: don't cast u32 to unsigned long ssb: gpio: add own IRQ domain MIPS: BCM47XX: fix sparse warnings in board.c MIPS: BCM47XX: add board detection for Linksys WRT54GS V1 MIPS: BCM47XX: fix detection for some boards MIPS: BCM47XX: Enable buttons support on SSB MIPS: BCM47XX: Convert WNDR4500 to new syntax MIPS: BCM47XX: Use "timer" trigger for status LEDs ...		11 years ago
..
hvc	s390/hvc_iucv: Automatically assign free HVC terminal devices	11 years ago
ipwireless	tty: delete non-required instances of include <linux/init.h>	11 years ago
serial	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	11 years ago
vt	vt: properly ignore xterm-256 colour codes	12 years ago
Kconfig	drivers/tty: ehv_bytechan fails to build as a module	11 years ago
Makefile	tty: Add timed, writer-prioritized rw semaphore	12 years ago
amiserial.c	tty/amiserial: avoid interruptible_sleep_on	11 years ago
bfin_jtag_comm.c	TTY: bfin_jtag_comm: fix incorrect placement of __initdata tag	12 years ago
cyclades.c	tty: an overflow of multiplication in drivers/tty/cyclades.c	11 years ago
ehv_bytechan.c	drivers: clean-up prom.h implicit includes	12 years ago
goldfish.c	tty: delete non-required instances of include <linux/init.h>	11 years ago
isicom.c	TTY: switch tty_flip_buffer_push	12 years ago
metag_da.c	tree-wide: use reinit_completion instead of INIT_COMPLETION	11 years ago
moxa.c	TTY: add tty_port_tty_hangup helper	12 years ago
moxa.h	…
mxser.c	tty: mxser: Fix build warning introduced by dfc7b837c7 (Re: linux-next: build warning after merge of the tty.current tree)	12 years ago
mxser.h	…
n_gsm.c	TTY/n_gsm: Removing the wrong tty_unlock/lock() in gsm_dlci_release()	11 years ago
n_hdlc.c	…
n_r3964.c	tty: Always handle NULL flag ptr	11 years ago
n_tracerouter.c	…
n_tracesink.c	…
n_tracesink.h	…
n_tty.c	Merge 3.13-rc5 into tty-next	11 years ago
nozomi.c	tty: Remove unnecessary semicolons	11 years ago
pty.c	tty: Fix lock order in tty_do_resize()	12 years ago
rocket.c	tty: remove DEFINE_PCI_DEVICE_TABLE macro	11 years ago
rocket.h	…
rocket_int.h	…
synclink.c	tty: synclink: avoid sleep_on race	11 years ago
synclink_gt.c	tty: synclink: avoid sleep_on race	11 years ago
synclinkmp.c	tty: synclink: avoid sleep_on race	11 years ago
sysrq.c	sysrq: Allow magic SysRq key functions to be disabled through Kconfig	11 years ago
tty_audit.c	audit: convert all sessionid declaration to unsigned int	11 years ago
tty_buffer.c	tty: delete non-required instances of include <linux/init.h>	11 years ago
tty_io.c	tty: Reset hupped state on open	11 years ago
tty_ioctl.c	tty: Fix SIGTTOU not sent with tcflush()	12 years ago
tty_ldisc.c	tty: delete non-required instances of include <linux/init.h>	11 years ago
tty_ldsem.c	tty: Fix hang at ldsem_down_read()	11 years ago
tty_mutex.c	…
tty_port.c	tty: delete non-required instances of include <linux/init.h>	11 years ago