Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Conflicts:
	arch/arm/mach-omap2/omap_hwmod_2430_data.c
	arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
parents 3b03b58d 18a26892
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