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

Merge branch 'devel-stable' into for-linus 

Conflicts:
	arch/arm/kernel/setup.c
	arch/arm/mach-shmobile/board-kota2.c
parents a32737e1 ef3a0bf5
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