Merge branch 'omap-for-v3.18/fixes-not-urgent' into omap-for-v3.18/intc-v2
authorTony Lindgren <tony@atomide.com>
Thu, 11 Sep 2014 20:03:25 +0000 (13:03 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 11 Sep 2014 20:03:25 +0000 (13:03 -0700)
1  2 
arch/arm/mach-omap2/common.h
arch/arm/mach-omap2/pdata-quirks.c

Simple merge
Simple merge