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 d144746478 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus ... Pull MIPS updates from Ralf Baechle: "MIPS updates: - All the things that didn't make 3.10. - Removes the Windriver PPMC platform. Nobody will miss it. - Remove a workaround from kernel/irq/irqdomain.c which was there exclusivly for MIPS. Patch by Grant Likely. - More small improvments for the SEAD 3 platform - Improvments on the BMIPS / SMP support for the BCM63xx series. - Various cleanups of dead leftovers. - Platform support for the Cavium Octeon-based EdgeRouter Lite. Two large KVM patchsets didn't make it for this pull request because their respective authors are vacationing" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (124 commits) MIPS: Kconfig: Add missing MODULES dependency to VPE_LOADER MIPS: BCM63xx: CLK: Add dummy clk_{set,round}_rate() functions MIPS: SEAD3: Disable L2 cache on SEAD-3. MIPS: BCM63xx: Enable second core SMP on BCM6328 if available MIPS: BCM63xx: Add SMP support to prom.c MIPS: define write{b,w,l,q}_relaxed MIPS: Expose missing pci_io{map,unmap} declarations MIPS: Malta: Update GCMP detection. Revert "MIPS: make CAC_ADDR and UNCAC_ADDR account for PHYS_OFFSET" MIPS: APSP: Remove <asm/kspd.h> SSB: Kconfig: Amend SSB_EMBEDDED dependencies MIPS: microMIPS: Fix improper definition of ISA exception bit. MIPS: Don't try to decode microMIPS branch instructions where they cannot exist. MIPS: Declare emulate_load_store_microMIPS as a static function. MIPS: Fix typos and cleanup comment MIPS: Cleanup indentation and whitespace MIPS: BMIPS: support booting from physical CPU other than 0 MIPS: Only set cpu_has_mmips if SYS_SUPPORTS_MICROMIPS MIPS: GIC: Fix gic_set_affinity infinite loop MIPS: Don't save/restore OCTEON wide multiplier state on syscalls. ...		12 years ago
..
agp	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	12 years ago
hw_random	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	12 years ago
ipmi	char: Convert use of typedef ctl_table to struct ctl_table	12 years ago
mwave	mwave: fix info leak in mwave_ioctl()	12 years ago
pcmcia	Finally eradicate CONFIG_HOTPLUG	12 years ago
tpm	tpm/tpm_i2c_infineon: Remove unused header file	12 years ago
xilinx_hwicap	char: xilinx_hwicap: Fix typo in comment and extend it	12 years ago
Kconfig	stallion: final cleanup	12 years ago
Makefile	…
apm-emulation.c	…
applicom.c	applicom: use correct array offset	12 years ago
applicom.h	…
bfin-otp.c	…
bsr.c	…
ds1302.c	…
ds1620.c	ds1620: single_open() leak	12 years ago
dsp56k.c	new helper: file_inode(file)	12 years ago
dtlk.c	new helper: file_inode(file)	12 years ago
efirtc.c	rtc: single_open() leaks	12 years ago
generic_nvram.c	…
genrtc.c	rtc: single_open() leaks	12 years ago
hangcheck-timer.c	…
hpet.c	char: Convert use of typedef ctl_table to struct ctl_table	12 years ago
i8k.c	…
lp.c	Char: lp, protect LPGETSTATUS with port_mutex	12 years ago
mbcs.c	…
mbcs.h	…
mem.c	/dev/oldmem: Remove the interface	12 years ago
misc.c	Revert "char: misc: assign file->private_data in all cases"	12 years ago
mmtimer.c	…
msm_smd_pkt.c	…
mspec.c	char: Use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT	12 years ago
nsc_gpio.c	new helper: file_inode(file)	12 years ago
nvram.c	…
nwbutton.c	…
nwbutton.h	…
nwflash.c	…
pc8736x_gpio.c	…
ppdev.c	new helper: file_inode(file)	12 years ago
ps3flash.c	ps3flash: switch to generic_file_llseek_size()	12 years ago
random.c	char: Convert use of typedef ctl_table to struct ctl_table	12 years ago
raw.c	new helper: file_inode(file)	12 years ago
rtc.c	char: Convert use of typedef ctl_table to struct ctl_table	12 years ago
scx200_gpio.c	…
snsc.c	…
snsc.h	…
snsc_event.c	…
sonypi.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	12 years ago
tb0219.c	new helper: file_inode(file)	12 years ago
tile-srom.c	tile-srom: switch to fixed_size_llseek()	12 years ago
tlclk.c	…
toshiba.c	…
ttyprintk.c	ttyprintk: Fix NULL pointer deref by setting tty_port ops after initializing port	12 years ago
uv_mmtimer.c	…
virtio_console.c	Lots of virtio work which wasn't quite ready for last merge window. Plus	12 years ago