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 0cf975e169 Merge branch 'cris' of git://www.jni.nu/cris ... * 'cris' of git://www.jni.nu/cris: (158 commits) CRIS v32: Remove hwregs/timer_defs.h, it is now architecture specific. CRIS v32: Change drivers/i2c.c locking. CRIS v32: Rewrite ARTPEC-3 gpio driver to avoid volatiles and general cleanup. CRIS: Add new timerfd syscall entries. MAINTAINERS: Add my information for the CRIS port. CRIS v32: Correct spelling of bandwidth in function name. CRIS v32: Clean up nandflash.c for ARTPEC-3 and ETRAX FS. CRIS v10: Cleanup of drivers/gpio.c CRIS v10: drivers/net/cris/eth_v10.c rename LED defines to CRIS_LED to avoid name clash. CRIS: Make io_pwm_set_period members unsigned in etraxgpio.h CRIS: Move ETRAX_AXISFLASHMAP to common Kconfig file. CRIS: Drop regs parameter from call to profile_tick in kernel/time.c CRIS v32: Fix minor formatting issue in mach-a3/io.c CRIS v32: Initialize GIO even if we're rambooting in kernel/head.S CRIS v32: Remove kernel/arbiter.c, it now exists in machine dependent directory. CRIS v32: Minor changes to avoid errors in asm-cris/arch-v32/hwregs/reg_rdwr.h CRIS v32: arch-v32/hwregs/intr_vect_defs.h moved to machine dependent directory. CRIS v32: Correct offset for TASK_pid in asm-cris/arch-v32/offset.h CRIS v32: Move register map header to machine dependent directory. CRIS v32: Let compiler know that memory is clobbered after a break op. ...		17 years ago
..
arch-v10	CRIS: Break long comment line in include/asm-cris/arch-v10/page.h	17 years ago
arch-v32	CRIS v32: Remove hwregs/timer_defs.h, it is now architecture specific.	17 years ago
Kbuild	CRIS: Add missing headers to include/asm-cris Kbuild files.	17 years ago
a.out.h	aout: move STACK_TOP[_MAX] to asm/processor.h	17 years ago
atomic.h	CRIS: Fix bugs in return value of atomic_inc_return and atomic_dec_return.	17 years ago
auxvec.h	…
axisflashmap.h	CRIS: Merge axisflashmap.h with Axis internal changes.	17 years ago
bitops.h	cris: remove unused __dummy, CONST_ADDR and ADDR from bitops.h	17 years ago
bug.h	CRIS: Include arch dependent bug.h.	17 years ago
bugs.h	…
byteorder.h	…
cache.h	…
cacheflush.h	…
checksum.h	…
cputime.h	…
current.h	…
delay.h	CRIS: Allow arch dependent delay to override common version.	17 years ago
device.h	…
div64.h	…
dma-mapping.h	CRIS: Remove define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY	17 years ago
dma.h	…
elf.h	Cleanup asm/{elf,page,user}.h: #ifdef __KERNEL__ is no longer needed	17 years ago
emergency-restart.h	…
errno.h	…
eshlibld.h	…
ethernet.h	…
etraxgpio.h	CRIS: Make io_pwm_set_period members unsigned in etraxgpio.h	17 years ago
etraxi2c.h	…
fasttimer.h	CRISv10 improve and bugfix fasttimer	17 years ago
fb.h	…
fcntl.h	…
futex.h	…
hardirq.h	…
hw_irq.h	…
ide.h	…
io.h	CRIS: Correct comment in io.h to describe reality of I/O space.	17 years ago
ioctl.h	…
ioctls.h	…
ipcbuf.h	…
irq.h	…
irq_regs.h	…
kdebug.h	…
kmap_types.h	…
linkage.h	…
local.h	…
mman.h	…
mmu.h	…
mmu_context.h	…
module.h	…
msgbuf.h	…
mutex.h	…
namei.h	…
page.h	CONFIG_HIGHPTE vs. sub-page page tables.	17 years ago
param.h	avoid overflows in kernel/time.c	17 years ago
pci.h	…
percpu.h	…
pgalloc.h	CONFIG_HIGHPTE vs. sub-page page tables.	17 years ago
pgtable.h	CRIS: Correct pfn_pte to make it possible to ioremap uncached addresses.	17 years ago
poll.h	…
posix_types.h	asm-*/posix_types.h: scrub __GLIBC__	17 years ago
processor.h	aout: move STACK_TOP[_MAX] to asm/processor.h	17 years ago
ptrace.h	…
resource.h	…
rs485.h	…
rtc.h	CRIS v10: Cleanup rtc.h	17 years ago
scatterlist.h	…
sections.h	…
segment.h	…
semaphore-helper.h	…
semaphore.h	…
sembuf.h	…
setup.h	…
shmbuf.h	…
shmparam.h	…
sigcontext.h	…
siginfo.h	…
signal.h	…
smp.h	CRIS: Update cpu_possible_map and raw_smp_processor_id in smp.h header.	17 years ago
socket.h	[NET]: Introducing socket mark socket option.	17 years ago
sockios.h	…
spinlock.h	…
stat.h	…
statfs.h	…
string.h	…
sync_serial.h	CRIS v32: Add SECOND_WORD_SYNC, used in sync_serial.	17 years ago
system.h	Add cmpxchg_local to cris	17 years ago
termbits.h	…
termios.h	…
thread_info.h	cris build fixes: corrected and improved NMI and IRQ handling	17 years ago
timex.h	…
tlb.h	CRIS tlb.h should include linux/pagemap.h	17 years ago
tlbflush.h	…
topology.h	…
types.h	…
uaccess.h	…
ucontext.h	…
unaligned.h	…
unistd.h	CRIS: Add new timerfd syscall entries.	17 years ago
user.h	Sanitize the type of struct user.u_ar0	17 years ago