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

Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for-linus 

Conflicts:
	arch/arm/mach-omap2/board-3430sdp.c
parents c3bbcf5d d5e13227
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