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

Merge branch 'p2v' into devel 

Conflicts:
	arch/arm/kernel/module.c
	arch/arm/mach-s5pv210/sleep.S
parents bd1274dc b511d75d
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