Skip to content
Commit 5d3cb0ff authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'v3.2-rc7' into next/pm 

Conflicts:
	arch/arm/kernel/setup.c
	arch/arm/mach-shmobile/board-kota2.c
parents 3b0d5971 5f0a6e2d
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