Commit 9759d22c authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'master' into devel 

Conflicts:
	arch/arm/include/asm/elf.h
	arch/arm/kernel/module.c
parents ed40d0c4 f0bba9f9
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