Skip to content
Snippets Groups Projects
Commit e94c805f authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-arm' of... 

Merge branch 'for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git into for-linus

Conflicts:
	arch/arm/kernel/ptrace.c
parents ef0c1484 70b58d89
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment