Learn more about cloning repositories
You have read-only access
Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for-linus Conflicts: arch/arm/mach-omap2/board-3430sdp.c
