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

Merge branch 'integration-2.6.39-for-tony' of... 

Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus

Conflicts:
	arch/arm/mach-omap2/pm34xx.c
parents 94a06b74 a08572ae
Expand all 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