Learn more about cloning repositories
You have read-only access
Merge branch 'highbank/soc' into next/soc Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/mach-omap2/board-generic.c arch/arm/plat-mxc/include/mach/gpio.h
