Merge branch 'fixes-rc1' into omap-for-v4.2/fixes
authorTony Lindgren <tony@atomide.com>
Mon, 6 Jul 2015 12:33:17 +0000 (05:33 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 6 Jul 2015 12:33:17 +0000 (05:33 -0700)
1  2 
drivers/memory/omap-gpmc.c

Simple merge