Commits
Merge branch 'for-v3.19/gpmc-omap' of github.com:rogerq/linux into omap-for-v3.19/gpmc Conflicts: arch/arm/mach-omap2/gpmc.c
Merge branch 'for-v3.19/gpmc-omap' of github.com:rogerq/linux into omap-for-v3.19/gpmc Conflicts: arch/arm/mach-omap2/gpmc.c