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 7e2225d860 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus ... * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (54 commits) [MIPS] Remove mips_machtype for LASAT machines [MIPS] Remove mips_machtype from EMMA2RH machines [MIPS] Remove mips_machtype from ARC based machines [MIPS] MTX-1 flash partition setup move to platform devices registration [MIPS] TXx9: cleanup and fix some sparse warnings [MIPS] TXx9: rename asm-mips/mach-jmr3927 to asm-mips/mach-tx39xx [MIPS] remove machtype for group Toshiba [MIPS] separate rbtx4927_time_init() and rbtx4937_time_init() [MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init() [MIPS] txx9_cpu_clock setup move to rbtx4927_time_init() [MIPS] txx9_board_vec set directly without mips_machtype [MIPS] IP22: Add platform device for Indy volume buttons [MIPS] cmbvr4133: Remove support [MIPS] remove wrppmc_machine_power_off() [MIPS] replace inline assembler to cpu_wait() [MIPS] IP22/28: Add platform devices for HAL2 [MIPS] TXx9: Update and merge defconfigs [MIPS] TXx9: Make single kernel can support multiple boards [MIPS] TXx9: Update defconfigs [MIPS] TXx9: Reorganize PCI code ...		17 years ago
..
dec	[MIPS] DECstation: Document more MB ASIC register bits	17 years ago
emma2rh	…
fw	[MIPS] CFE: Make code remotely resemble Linux code.	17 years ago
ip32	[MIPS] IP32: More interrupt renumbering fixes.	17 years ago
lasat	[MIPS] Remove mips_machtype for LASAT machines	17 years ago
mach-au1x00	ALSA: ASoC: Au12x0/Au1550 PSC Audio support	17 years ago
mach-bcm47xx	…
mach-cobalt	[MIPS] remove unneeded button check for reset	17 years ago
mach-db1x00	[MIPS] Alchemy: remove unused MMC macros from db1x00 header.	17 years ago
mach-dec	…
mach-emma2rh	…
mach-excite	include/asm-mips/: Spelling fixes	17 years ago
mach-generic	[MIPS] make fallback gpio.h gpiolib-friendly	17 years ago
mach-ip22	…
mach-ip27	[MIPS] IP27: Fix build bug due to missing include	17 years ago
mach-ip28	[MIPS] IP28 support	17 years ago
mach-ip32	…
mach-jazz	[MIPS] Fix and cleanup the MIPS part of the (ab)use of CLOCK_TICK_RATE.	17 years ago
mach-lasat	[MIPS] Lasat: fix LASAT_CASCADE_IRQ	17 years ago
mach-lemote	…
mach-malta	[MIPS] Malta: Cleanup organization of code into directories.	17 years ago
mach-mipssim	…
mach-pb1x00	[MIPS] Pb1200/DBAu1200 code style cleanup	17 years ago
mach-pnx8550	[MIPS] checkfiles: Fix "need space after that ','" errors.	18 years ago
mach-rm	[MIPS] Fix and cleanup the MIPS part of the (ab)use of CLOCK_TICK_RATE.	17 years ago
mach-sibyte	…
mach-tx39xx	[MIPS] TXx9: rename asm-mips/mach-jmr3927 to asm-mips/mach-tx39xx	17 years ago
mach-tx49xx	…
mach-vr41xx	[MIPS] cmbvr4133: Remove support	17 years ago
mach-wrppmc	include/asm-mips/: Spelling fixes	17 years ago
mach-yosemite	…
mips-boards	[MIPS] SEAD: Remove support code.	17 years ago
pci	Fix misspellings of "system", "controller", "interrupt" and "necessary".	17 years ago
pmc-sierra/msp71xx	[MIPS] Delete CONFIG_MSP_FPGA	17 years ago
sgi	include/asm-mips/: Spelling fixes	17 years ago
sibyte	[MIPS] Remove CONFIG_SIBYTE_PT{1120,1125,SWARM}	17 years ago
sn	include/asm-mips/: Spelling fixes	17 years ago
txx9	[MIPS] TXx9: cleanup and fix some sparse warnings	17 years ago
vr41xx	[MIPS] cmbvr4133: Remove support	17 years ago
xtalk	…
Kbuild	…
a.out.h	aout: move STACK_TOP[_MAX] to asm/processor.h	17 years ago
abi.h	…
addrspace.h	[MIPS] Put cast inside macro instead of all the callers	17 years ago
asm.h	[MIPS] IP28: added cache barrier to assembly routines	17 years ago
asmmacro-32.h	…
asmmacro-64.h	…
asmmacro.h	…
atomic.h	[MIPS] Fix bug in atomic_sub_if_positive.	17 years ago
auxvec.h	…
barrier.h	[MIPS] IP28: switch to "normal" mode after PROM no longer needed	17 years ago
bcache.h	…
bitops.h	[MIPS] Fix asm constraints for 'ins' instructions.	17 years ago
bootinfo.h	[MIPS] Remove mips_machtype for LASAT machines	17 years ago
branch.h	…
break.h	…
bug.h	…
bugs.h	[MIPS] R4000/R4400 errata workarounds	17 years ago
byteorder.h	…
cache.h	…
cachectl.h	…
cacheflush.h	[MIPS] Handle aliases in vmalloc correctly.	17 years ago
cacheops.h	[MIPS] Cacheops.h: Fix typo.	17 years ago
checksum.h	…
cmp.h	[MIPS] Add support for MIPS CMP platform.	17 years ago
cmpxchg.h	Add cmpxchg64 and cmpxchg64_local to mips	17 years ago
compat-signal.h	…
compat.h	asm-*/compat.h: fix typo in comment	17 years ago
compiler.h	[MIPS] Add empty argument parenthesis to GCC_IMM_ASM	17 years ago
cpu-features.h	[MIPS] Fix use of smp_processor_id() in preemptible code.	17 years ago
cpu-info.h	[MIPS] vpe_id is required for VSMP and SMTC builds	17 years ago
cpu.h	[MIPS] modify the MIPS CPU classfication	17 years ago
cputime.h	…
current.h	…
debug.h	…
delay.h	[MIPS] R4000/R4400 daddiu erratum workaround	17 years ago
device.h	…
div64.h	rename div64_64 to div64_u64	17 years ago
dma-mapping.h	…
dma.h	[MIPS] IP28 support	17 years ago
ds1286.h	…
ds1287.h	[MIPS] DS1287: Add clockevent driver	17 years ago
dsp.h	…
edac.h	…
elf.h	Cleanup asm/{elf,page,user}.h: #ifdef __KERNEL__ is no longer needed	17 years ago
emergency-restart.h	…
errno.h	…
fb.h	…
fcntl.h	…
fixmap.h	[MIPS] fixmap: delete unused __set_fixmap, set_fixmap and set_fixmap_nocache	17 years ago
floppy.h	…
fpregdef.h	…
fpu.h	remove asm/bitops.h includes	17 years ago
fpu_emulator.h	…
futex.h	asm-*/futex.h should include linux/uaccess.h	17 years ago
gcmpregs.h	[MIPS] Add support for MIPS CMP platform.	17 years ago
gdb-stub.h	…
gic.h	[MIPS] Malta: Fix build errors for 64-bit kernels	17 years ago
gpio.h	…
gt64120.h	[MIPS] time: Add GT641xx timer0 clockevent driver	17 years ago
hardirq.h	…
hazards.h	…
highmem.h	[MIPS] Fix yosemite build error	17 years ago
hw_irq.h	…
i8253.h	[MIPS] Fix pcspeaker build.	17 years ago
i8259.h	…
ide.h	…
inst.h	…
io.h	[MIPS] Remove obsolete isa_slot_offset	17 years ago
ioctl.h	…
ioctls.h	[MIPS] checkfiles: Fix "need space after that ','" errors.	18 years ago
ipcbuf.h	…
irq.h	…
irq_cpu.h	…
irq_gt641xx.h	…
irq_regs.h	…
irqflags.h	…
isadep.h	…
jazz.h	…
jazzdma.h	…
kdebug.h	…
kexec.h	kdump/kexec: calculate note size at compile time	18 years ago
kmap_types.h	…
kspd.h	…
kvm.h	kvm: provide kvm.h for all architecture: fixes headers_install	17 years ago
linkage.h	…
local.h	…
m48t35.h	…
m48t37.h	…
mc146818-time.h	[MIPS] checkfiles: Fix "need space after that ','" errors.	18 years ago
mc146818rtc.h	…
mips_mt.h	…
mipsmtregs.h	[MIPS] Add support for MIPS CMP platform.	17 years ago
mipsprom.h	[MIPS] RM: Collected changes	17 years ago
mipsregs.h	[MIPS] Add accessors for random register.	17 years ago
mman.h	…
mmu.h	Linux-2.6.12-rc2	20 years ago
mmu_context.h	…
mmzone.h	…
module.h	…
msc01_ic.h	…
msgbuf.h	…
mutex.h	…
namei.h	[MIPS] IRIX: Goodbye and thanks for all the fish	17 years ago
nile4.h	…
paccess.h	…
page.h	CONFIG_HIGHPTE vs. sub-page page tables.	17 years ago
param.h	…
parport.h	…
pci.h	[MIPS] Declare some pci variables in header file	17 years ago
percpu.h	Linux-2.6.12-rc2	20 years ago
pgalloc.h	CONFIG_HIGHPTE vs. sub-page page tables.	17 years ago
pgtable-32.h	[MIPS] All MIPS32 processors support64-bit physical addresses.	17 years ago
pgtable-64.h	…
pgtable-bits.h	[MIPS] Fix build for PNX platforms.	17 years ago
pgtable.h	[MIPS] Add missing braces to pte_mkyoung	17 years ago
pmon.h	…
poll.h	Consolidate asm/poll.h	18 years ago
posix_types.h	asm-*/posix_types.h: scrub __GLIBC__	17 years ago
prefetch.h	…
processor.h	aout: move STACK_TOP[_MAX] to asm/processor.h	17 years ago
ptrace.h	…
r4k-timer.h	[MIPS] Add support for MIPS CMP platform.	17 years ago
r4kcache.h	[MIPS] Use real cache invalidate	17 years ago
reboot.h	[MIPS] Rename _machine_power_off to pm_power_off so the kernel builds again.	19 years ago
reg.h	…
regdef.h	…
resource.h	…
rm9k-ocd.h	…
rtlx.h	[MIPS] Fix typo in header guard	17 years ago
scatterlist.h	Add CONFIG_DEBUG_SG sg validation	17 years ago
seccomp.h	…
sections.h	…
segment.h	…
semaphore.h	Generic semaphore implementation	17 years ago
sembuf.h	…
serial.h	…
setup.h	[MIPS] fix sparse warning about setup_early_printk()	17 years ago
sgialib.h	[MIPS] Fix and cleanup the mess that a dozen prom_printf variants are.	18 years ago
sgiarcs.h	…
sgidefs.h	…
shmbuf.h	…
shmparam.h	…
sigcontext.h	[MIPS] Add basic SMARTMIPS ASE support	18 years ago
siginfo.h	[MIPS] checkfiles: Fix "need space after that ','" errors.	18 years ago
signal.h	[MIPS] IRIX: Goodbye and thanks for all the fish	17 years ago
sim.h	…
smp-ops.h	[MIPS] Add support for MIPS CMP platform.	17 years ago
smp.h	mips: convert to generic helpers for IPI function calls	17 years ago
smtc.h	[MIPS] Add support for MIPS CMP platform.	17 years ago
smtc_ipi.h	[MIPS] SMTC: Fix build error.	17 years ago
smtc_proc.h	…
smvp.h	[MIPS] Add support for MIPS CMP platform.	17 years ago
sni.h	[MIPS] RM: fix EISA=n compilation	17 years ago
socket.h	[NET]: Introducing socket mark socket option.	17 years ago
sockios.h	…
sparsemem.h	[MIPS] Fix sparsemem support.	19 years ago
spinlock.h	…
spinlock_types.h	…
stackframe.h	[MIPS] R4000/R4400 daddiu erratum workaround	17 years ago
stacktrace.h	…
stat.h	…
statfs.h	…
string.h	…
suspend.h	…
sysmips.h	…
system.h	IP22ZILOG: fix lockup and sysrq	17 years ago
termbits.h	…
termios.h	…
thread_info.h	…
time.h	[MIPS] Clocksource: Only install r4k counter as clocksource if present.	17 years ago
timex.h	[MIPS] Change get_cycles to always return 0.	17 years ago
titan_dep.h	…
tlb.h	…
tlbdebug.h	…
tlbflush.h	remove unused flush_tlb_pgtables	17 years ago
topology.h	[MIPS] MT: Scheduler support for SMT	17 years ago
traps.h	[MIPS] Remove board_watchpoint_handler	17 years ago
txx9irq.h	…
txx9pio.h	[MIPS] generic txx9 gpio support	17 years ago
txx9tmr.h	[MIPS] txx9tmr clockevent/clocksource driver	17 years ago
types.h	fix asm-mips/types.h syntax error	17 years ago
uaccess.h	[MIPS] R4000/R4400 daddiu erratum workaround	17 years ago
ucontext.h	…
unaligned.h	kernel: Move arches to use common unaligned access	17 years ago
unistd.h	[MIPS] Wire up the timerfd_*() o32 system calls	17 years ago
user.h	Sanitize the type of struct user.u_ar0	17 years ago
vga.h	[MIPS] checkfiles: Fix "need space after that ','" errors.	18 years ago
vpe.h	…
war.h	[MIPS] R4000/R4400 errata workarounds	17 years ago
wbflush.h	…
xor.h	…