Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for...
authorTony Lindgren <tony@atomide.com>
Wed, 7 Nov 2012 01:33:31 +0000 (17:33 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 7 Nov 2012 01:33:31 +0000 (17:33 -0800)
Conflicts:
arch/arm/plat-omap/dmtimer.c


Trivial merge