Learn more about cloning repositories
You have read-only access
Merge branch 'master' of git://git.marvell.com/orion into devel Conflicts: arch/arm/mach-mx1/devices.c
