Skip to content
Commit 2dde3bcc authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for-v3.19/gpmc-omap' of github.com:rogerq/linux into omap-for-v3.19/gpmc 

Conflicts:
	arch/arm/mach-omap2/gpmc.c
parents 8f595117 8bf9be56
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