Learn more about cloning repositories
You have read-only access
Merge branch 'master' into for-next Conflicts: arch/arm/mach-omap1/board-nokia770.c
