Skip to content
Commit ed141f28 authored by Russell King's avatar Russell King
Browse files

Merge branch 'syscalls' into for-linus 

Conflicts:
	arch/arm/include/asm/unistd.h
	arch/arm/include/uapi/asm/unistd.h
	arch/arm/kernel/calls.S
parents 41884629 219622b7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment