Skip to content
Commit b6825d2d authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'omap-all' into devel 

Conflicts:

	arch/arm/mach-omap2/gpmc.c
	arch/arm/mach-omap2/irq.c
parents 6defd904 aa59e19d
Expand all 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